zephyr-edge-contract 0.0.20 → 0.0.22

package/dist/lib/utils/ze-http-request.js

@@ -1,63 +1,156 @@
 "use strict";
+var _ZeHttpRequest_instances, _ZeHttpRequest_start, _ZeHttpRequest_url, _ZeHttpRequest_options, _ZeHttpRequest_data, _ZeHttpRequest_promise, _ZeHttpRequest_reject, _ZeHttpRequest_resolve, _ZeHttpRequest_request, _ZeHttpRequest_onRequestError, _ZeHttpRequest_onResponse, _ZeHttpRequest_handleUnknownError, _ZeHttpRequest_onResponseAsync, _ZeHttpRequest_redact;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.request = void 0;
+exports.ZeHttpRequest = void 0;
 const tslib_1 = require("tslib");
 const http = tslib_1.__importStar(require("node:http"));
 const https = tslib_1.__importStar(require("node:https"));
-const debug_1 = require("./debug");
+const consumers_1 = require("node:stream/consumers");
+const get_api_contract_1 = require("../api-contract-negotiation/get-api-contract");
+const errors_1 = require("../errors");
 const token_1 = require("../node-persist/token");
+const debug_1 = require("./debug");
+const promise_1 = require("./promise");
 const safe_json_parse_1 = require("./safe-json-parse");
-const debug_2 = require("./debug");
-const picocolor_1 = require("./picocolor");
-function _redact(str) {
-    if (!str)
-        return '';
-    return str.replace(/Bearer ([^"|']+)/gi, 'Bearer [REDACTED]').replace(/"?jwt"?:["|\W']{0,2}([^"|']+)(["|'])/gi, 'jwt: [REDACTED]');
-}
-function request(url, options, data) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const _https = url.protocol !== 'https:' ? http : https;
-        return new Promise((resolve, reject) => {
-            const req_start = Date.now();
-            const _options_str = _redact(JSON.stringify(options));
-            const req = _https.request(url, options !== null && options !== void 0 ? options : {}, (res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                if (res.statusCode === 401 || res.statusCode === 403) {
-                    yield (0, token_1.cleanTokens)();
-                    const err = new Error(`${debug_2.brightRedBgName} ${(0, picocolor_1.red)(`Error [ZE10018]: auth error, please sign in to https://app.zephyr-cloud.io then try to build again. See documentation https://docs.zephyr-cloud.io/errors/ze10018`)}`);
-                    err.stack = void 0;
-                    throw err;
-                }
-                const response = [];
-                res.on('data', (d) => response.push(d));
-                res.on('end', () => {
-                    var _a, _b, _c, _d;
-                    const _response = (_a = Buffer.concat(response)) === null || _a === void 0 ? void 0 : _a.toString();
-                    const message = _redact(`[${(options === null || options === void 0 ? void 0 : options.method) || 'GET'}][${url}]: ${Date.now() - req_start}ms` +
-                        ((data === null || data === void 0 ? void 0 : data.length) ? ` - ${(((_b = data.length) !== null && _b !== void 0 ? _b : 0) / 1024).toFixed(2)}kb` : '') +
-                        (_response ? `\n response: ${_response}` : '') +
-                        (_options_str ? `\n options: ${_options_str}` : ''));
-                    if (_response === 'Not Implemented')
-                        return reject(message);
-                    const parsed_response = (0, safe_json_parse_1.safe_json_parse)(_response);
-                    if ((typeof res.statusCode === 'number' && res.statusCode > 299) ||
-                        (typeof (parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.status) === 'number' && (parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.status) > 299)) {
-                        return reject(`${debug_2.brightRedBgName} Error from ${url}: \n ${(_c = parsed_response === null || parsed_response === void 0 ? void 0 : parsed_response.message) !== null && _c !== void 0 ? _c : _response}`);
-                    }
-                    if (url.pathname.indexOf('application/logs') === -1)
-                        (0, debug_1.ze_log)(message);
-                    resolve((_d = parsed_response) !== null && _d !== void 0 ? _d : _response);
-                });
+/** Starts a new http request */
+class ZeHttpRequest {
+    constructor() {
+        _ZeHttpRequest_instances.add(this);
+        /** The time the request was started. */
+        _ZeHttpRequest_start.set(this, Date.now());
+        /** The URL to request. */
+        _ZeHttpRequest_url.set(this, void 0);
+        /** The options for the request. */
+        _ZeHttpRequest_options.set(this, void 0);
+        /** The data to send with the request. */
+        _ZeHttpRequest_data.set(this, void 0);
+        // private methods for resolving and rejecting the promise
+        _ZeHttpRequest_promise.set(this, (0, promise_1.PromiseWithResolvers)());
+        // promise extension
+        this.then = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise.then.bind(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").promise);
+        /** Handles the error when the request fails. */
+        _ZeHttpRequest_onRequestError.set(this, (cause) => {
+            var _a, _b;
+            if ('ERR_TLS_CERT_ALTNAME_INVALID' in cause) {
+                tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_TLS_CERT_ALTNAME_INVALID, {
+                    cause,
+                }));
+                return;
+            }
+            tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
+                url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
+                method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
+                content: 'Could not send request',
+                status: '-1',
+                cause,
             }));
-            req.on('error', (e) => {
-                (0, debug_1.ze_error)('ERR_UNKNOWN', `[${(options === null || options === void 0 ? void 0 : options.method) || 'GET'}][${url}]: ${Date.now() - req_start}ms \n ${_options_str} \n ${e}`);
-                reject(e);
-            });
-            if (data) {
-                req.write(data);
-            }
-            req.end();
         });
-    });
+        /** Handles the response from the server. */
+        _ZeHttpRequest_onResponse.set(this, (res) => {
+            tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onResponseAsync, "f").call(this, res).catch(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_handleUnknownError, "f"));
+        });
+        _ZeHttpRequest_handleUnknownError.set(this, (cause) => {
+            tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_reject).call(this, new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, { message: 'Could not process provided http.IncomingMessage', cause }));
+        });
+        _ZeHttpRequest_onResponseAsync.set(this, (res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            if (res.statusCode === 401 || res.statusCode === 403) {
+                // Clean the tokens and throw an error
+                yield (0, token_1.cleanTokens)();
+                throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_AUTH_ERROR, { message: 'Unauthorized request' });
+            }
+            const [resOk, resErr, resText] = yield (0, promise_1.PromiseTuple)((0, consumers_1.text)(res));
+            if (!resOk) {
+                return tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onRequestError, "f").call(this, resErr);
+            }
+            const message = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_redact).call(this, resText);
+            if (message === 'Not Implemented') {
+                throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_UNKNOWN, {
+                    message: 'Not implemented yet. Please get in contact with our support.',
+                });
+            }
+            if (res.statusCode === undefined) {
+                throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
+                    content: 'No status code found',
+                    method: (_b = (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : 'GET',
+                    url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
+                    status: -1,
+                });
+            }
+            if (!tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").pathname.includes('application/logs')) {
+                (0, debug_1.ze_log)(message);
+            }
+            // Only parses data if reply content is json
+            const resData = (_c = (0, safe_json_parse_1.safe_json_parse)(resText)) !== null && _c !== void 0 ? _c : resText;
+            if (res.statusCode >= 300) {
+                throw new errors_1.ZephyrError(errors_1.ZeErrors.ERR_HTTP_ERROR, {
+                    status: res.statusCode,
+                    url: tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").toString(),
+                    content: resData,
+                    method: (_e = (_d = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method) === null || _d === void 0 ? void 0 : _d.toUpperCase()) !== null && _e !== void 0 ? _e : 'GET',
+                });
+            }
+            tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_instances, "m", _ZeHttpRequest_resolve).call(this, resData);
+        }));
+    }
+    /** Creates a new http request. */
+    static from(urlStr, options = {}, data) {
+        const req = new ZeHttpRequest();
+        tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_data, data, "f");
+        tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_options, options, "f");
+        // Parse the url into a URL object
+        if (typeof urlStr === 'string') {
+            tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, new URL(urlStr), "f");
+        }
+        else if (urlStr instanceof URL) {
+            tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, urlStr, "f");
+        }
+        else {
+            tslib_1.__classPrivateFieldSet(req, _ZeHttpRequest_url, new URL(urlStr.path, urlStr.base), "f");
+            for (const [key, value] of Object.entries(urlStr.query)) {
+                tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").searchParams.append(key, String(value));
+            }
+        }
+        const is_preview = (0, get_api_contract_1.ZE_IS_PREVIEW)();
+        const ze_api_endpoint_host = (0, get_api_contract_1.ZE_API_ENDPOINT_HOST)();
+        const zephyr_api_endpoint = (0, get_api_contract_1.ZEPHYR_API_ENDPOINT)();
+        // Add a query param hint in preview environments
+        if (is_preview && tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").host === ze_api_endpoint_host) {
+            tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_url, "f").searchParams.set('api_host', zephyr_api_endpoint);
+        }
+        tslib_1.__classPrivateFieldGet(req, _ZeHttpRequest_instances, "m", _ZeHttpRequest_request).call(req);
+        return req;
+    }
+    /** Transforms `Promise<HttpResponse<T>>` into `Promise<T>` */
+    unwrap() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const [ok, error, data] = yield this;
+            if (!ok) {
+                throw error;
+            }
+            return data;
+        });
+    }
 }
-exports.request = request;
+exports.ZeHttpRequest = ZeHttpRequest;
+_ZeHttpRequest_start = new WeakMap(), _ZeHttpRequest_url = new WeakMap(), _ZeHttpRequest_options = new WeakMap(), _ZeHttpRequest_data = new WeakMap(), _ZeHttpRequest_promise = new WeakMap(), _ZeHttpRequest_onRequestError = new WeakMap(), _ZeHttpRequest_onResponse = new WeakMap(), _ZeHttpRequest_handleUnknownError = new WeakMap(), _ZeHttpRequest_onResponseAsync = new WeakMap(), _ZeHttpRequest_instances = new WeakSet(), _ZeHttpRequest_reject = function _ZeHttpRequest_reject(error) {
+    tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([false, error]);
+}, _ZeHttpRequest_resolve = function _ZeHttpRequest_resolve(data) {
+    tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_promise, "f").resolve([true, null, data]);
+}, _ZeHttpRequest_request = function _ZeHttpRequest_request() {
+    var _a;
+    const requester = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f").protocol === 'https:' ? https : http;
+    const req = requester.request(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f"), (_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f")) !== null && _a !== void 0 ? _a : {}, tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onResponse, "f"));
+    req.on('error', tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_onRequestError, "f"));
+    req.end(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f"));
+}, _ZeHttpRequest_redact = function _ZeHttpRequest_redact(response) {
+    var _a, _b;
+    const str = [
+        `[${tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f").method || 'GET'}][${tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_url, "f")}]: ${Date.now() - tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_start, "f")}ms`,
+        ((_a = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f")) === null || _a === void 0 ? void 0 : _a.length) ? ` - ${(((_b = tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_data, "f").length) !== null && _b !== void 0 ? _b : 0) / 1024).toFixed(2)}kb` : '',
+        response ? `Response: ${response}` : '',
+        tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f") ? `Options: ${JSON.stringify(tslib_1.__classPrivateFieldGet(this, _ZeHttpRequest_options, "f"))}` : '',
+    ].join('\n');
+    return str.replace(/Bearer ([^"|']+)/gi, 'Bearer [REDACTED]').replace(/"?jwt"?:["|\W']{0,2}([^"|']+)(["|'])/gi, 'jwt: [REDACTED]');
+};
 //# sourceMappingURL=ze-http-request.js.map

package/dist/lib/utils/ze-http-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../src/lib/utils/ze-http-request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ze-http-request.js","sourceRoot":"","sources":["../../../src/lib/utils/ze-http-request.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-edge-contract",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "Apache-2.0",
   "type": "commonjs",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zephyr-edge-contract",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "Apache-2.0",
   "type": "commonjs",
   "main": "dist/index.js",

package/test/utils/string.test.ts

@@ -0,0 +1,96 @@
+import { formatString } from '../../src/lib/utils/string';
+
+const data: { str: string; params: any; expected: string }[] = [
+  // no defaults
+  {
+    str: 'pre {{ name }} post',
+    params: { name: 'A' },
+    expected: 'pre A post',
+  },
+  {
+    str: '{{ name }} post',
+    params: { name: 'A' },
+    expected: 'A post',
+  },
+  {
+    str: 'pre {{ name }}',
+    params: { name: 'A' },
+    expected: 'pre A',
+  },
+
+  // without params
+  {
+    str: 'pre {{ name }} post',
+    params: {},
+    expected: 'pre name post',
+  },
+  {
+    str: '{{ name }} post',
+    params: {},
+    expected: 'name post',
+  },
+  {
+    str: 'pre {{ name }}',
+    params: {},
+    expected: 'pre name',
+  },
+
+  // Default
+  {
+    str: 'pre {{ name = B }} post',
+    params: {},
+    expected: 'pre B post',
+  },
+  {
+    str: '{{ name = B }} post',
+    params: {},
+    expected: 'B post',
+  },
+  {
+    str: 'pre {{ name = B }}',
+    params: {},
+    expected: 'pre B',
+  },
+
+  // Default with params
+  {
+    str: 'pre {{ name = B }} post',
+    params: { name: 'C' },
+    expected: 'pre C post',
+  },
+  {
+    str: '{{ name = B }} post',
+    params: { name: 'C' },
+    expected: 'C post',
+  },
+  {
+    str: 'pre {{ name = B }}',
+    params: { name: 'C' },
+    expected: 'pre C',
+  },
+
+  // Default with spaces
+  {
+    str: 'pre {{ name = A B }} post',
+    params: {},
+    expected: 'pre A B post',
+  },
+  {
+    str: '{{ name = A B }} post',
+    params: {},
+    expected: 'A B post',
+  },
+  {
+    str: 'pre {{ name = A B }}',
+    params: {},
+    expected: 'pre A B',
+  },
+];
+
+describe('formatString()', () => {
+  for (const { str, params, expected } of data) {
+    it(`Formats "${str}" with ${JSON.stringify(params)} to "${expected}"`, () => {
+      expect(formatString(str, params)).toBe(expected);
+    });
+  }
+});