@zcatalyst/transport 0.0.2 → 0.0.3

package/dist-cjs/http-handler.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizedHttpClient = exports.HttpClient = exports.DefaultHttpResponse = void 0;
+const auth_admin_1 = require("@zcatalyst/auth-admin");
 const utils_1 = require("@zcatalyst/utils");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
@@ -45,12 +46,13 @@ const querystring_1 = require("querystring");
 const stream_1 = require("stream");
 const url_1 = require("url");
 const util_1 = require("util");
-const package_json_1 = require("../package.json");
+const package_json_1 = __importDefault(require("../package.json"));
+const { version } = package_json_1.default;
 const errors_1 = require("./utils/errors");
 const form_data_1 = __importDefault(require("./utils/form-data"));
 const helpers_1 = require("./utils/helpers");
 const request_agent_1 = __importDefault(require("./utils/request-agent"));
-const { PROJECT_KEY_NAME, IS_LOCAL, ENVIRONMENT_KEY_NAME, ENVIRONMENT, USER_KEY_NAME, CREDENTIAL_USER, CATALYST_ORIGIN, X_ZOHO_CATALYST_ORG_ID, USER_AGENT, APM_INSIGHT, ACCEPT_HEADER, REQ_RETRY_THRESHOLD, PROJECT_HEADER, IS_APM } = utils_1.CONSTANTS;
+const { IS_LOCAL, USER_KEY_NAME, CREDENTIAL_USER, CATALYST_ORIGIN, USER_AGENT, APM_INSIGHT, ACCEPT_HEADER, REQ_RETRY_THRESHOLD, IS_APM } = utils_1.CONSTANTS;
 class DefaultHttpResponse {
     constructor(resp) {
         this.statusCode = resp.statusCode;
@@ -96,7 +98,7 @@ function rejectWithContext(reject, statusCode, data) {
         });
         return;
     }
-    catch (err) {
+    catch {
         reject({
             statusCode,
             message: (0, util_1.inspect)(data)
@@ -246,6 +248,11 @@ async function _request(transport, options, config, data, retryCount = 0) {
         if (data instanceof web_1.ReadableStream) {
             data = webStreamToNodeStream(data);
         }
+        if (typeof data === 'string' || Buffer.isBuffer(data)) {
+            req.write(data);
+            req.end();
+            return;
+        }
         data.on('error', (er) => {
             reject(er);
             req.end();
@@ -267,10 +274,14 @@ function webStreamToNodeStream(webStream) {
         }
     });
 }
-async function sendRequest(config) {
+async function sendRequest(config, componentName, componentVersion) {
     let data;
+    let userAgent = USER_AGENT.PREFIX + version;
+    if (componentName) {
+        userAgent += ` ${componentName}/${componentVersion || 'unknown'}`;
+    }
     let headers = Object.assign({
-        [USER_AGENT.KEY]: USER_AGENT.PREFIX + package_json_1.version
+        [USER_AGENT.KEY]: userAgent
     }, config.headers);
     if (config.data !== undefined) {
         switch (config.type) {
@@ -320,27 +331,17 @@ async function sendRequest(config) {
 class HttpClient {
     constructor(app) {
         this.app = app;
-        this.user = CREDENTIAL_USER.admin;
     }
-    async send(req, apmTrackerName) {
+    async send(req, apmTrackerName, componentVersion) {
         req.headers = Object.assign({}, req.headers);
         req.qs = Object.assign({}, req.qs);
         req.retry = req.retry || true;
         if (this.app !== undefined && req.service !== "external") {
-            this.user = this.app.credential.getCurrentUser();
-            req.headers[PROJECT_KEY_NAME] = this.app.config.projectKey;
-            req.headers[ENVIRONMENT_KEY_NAME] = this.app.config.environment;
-            req.headers[ENVIRONMENT] = this.app.config.environment;
-            if ((0, utils_1.isNonEmptyString)(process.env.X_ZOHO_CATALYST_ORG_ID)) {
-                req.headers[X_ZOHO_CATALYST_ORG_ID] = process.env.X_ZOHO_CATALYST_ORG_ID;
-            }
-            if ((0, utils_1.isNonEmptyString)(this.app.config.projectSecretKey)) {
-                req.headers[PROJECT_HEADER.projectSecretKey] = this.app.config
-                    .projectSecretKey;
-            }
+            const user = this.app.credential.getCurrentUser();
+            req.headers = (0, auth_admin_1.addDefaultAppHeaders)(req.headers, this.app.config);
             req.headers[USER_KEY_NAME] = this.app.credential.getCurrentUserType();
             if (IS_LOCAL === 'true') {
-                switch (this.user) {
+                switch (user) {
                     case CREDENTIAL_USER.admin:
                         req.origin =
                             'https://' +
@@ -363,14 +364,14 @@ class HttpClient {
             if (req.track && apmTrackerName && IS_APM === 'true') {
                 try {
                     const apminsight = await Promise.resolve().then(() => __importStar(require('apminsight')));
-                    resp = await apminsight.startTracker(APM_INSIGHT.tracker_name, apmTrackerName, () => sendRequest(req));
+                    resp = await apminsight.startTracker(APM_INSIGHT.tracker_name, apmTrackerName, () => sendRequest(req, apmTrackerName, componentVersion));
                 }
                 catch (err) {
                     throw new errors_1.CatalystAPIError('APM_TRACKER_ERROR', 'To enable APM tracking locally, please download the apminsight package from the UI and place it in the node_modules directory of your project.', err, 400);
                 }
             }
             else {
-                resp = await sendRequest(req);
+                resp = await sendRequest(req, apmTrackerName, componentVersion);
             }
             return new DefaultHttpResponse(resp);
         }
@@ -388,6 +389,7 @@ class AuthorizedHttpClient extends HttpClient {
         super(app);
         if (component) {
             this.componentName = component.getComponentName();
+            this.componentVersion = component.getComponentVersion?.();
         }
     }
     async send(request) {
@@ -396,7 +398,7 @@ class AuthorizedHttpClient extends HttpClient {
         if (request.auth !== false) {
             await this.app?.authenticateRequest(requestCopy);
         }
-        return await super.send(requestCopy, this.componentName);
+        return await super.send(requestCopy, this.componentName, this.componentVersion);
     }
 }
 exports.AuthorizedHttpClient = AuthorizedHttpClient;

package/dist-cjs/index.browser.js

@@ -1,13 +1,18 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CatalystAPIError = exports.ResponseType = exports.RequestType = exports.Handler = void 0;
+exports.CatalystAPIError = exports.ResponseType = exports.RequestType = exports.Handler = exports.PrefixedCatalystError = exports.CONSTANTS = exports.CatalystService = void 0;
 const fetch_handler_1 = require("./fetch-handler");
+var utils_1 = require("@zcatalyst/utils");
+Object.defineProperty(exports, "CatalystService", { enumerable: true, get: function () { return utils_1.CatalystService; } });
+Object.defineProperty(exports, "CONSTANTS", { enumerable: true, get: function () { return utils_1.CONSTANTS; } });
+var utils_2 = require("@zcatalyst/utils");
+Object.defineProperty(exports, "PrefixedCatalystError", { enumerable: true, get: function () { return utils_2.PrefixedCatalystError; } });
 class Handler {
     constructor(app, component) {
         this.component = component;
     }
     async send(options) {
-        return (await fetch_handler_1.ResponseHandler.send(options));
+        return (await fetch_handler_1.ResponseHandler.send(options, this.component?.getComponentName(), this.component?.getComponentVersion?.()));
     }
 }
 exports.Handler = Handler;

package/dist-cjs/index.js

@@ -1,20 +1,22 @@
-'use strict';
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormData = exports.CatalystAPIError = exports.ResponseType = exports.RequestType = exports.Handler = void 0;
-const auth_1 = require("@zcatalyst/auth");
+exports.FormData = exports.CatalystAPIError = exports.ResponseType = exports.RequestType = exports.Handler = exports.PrefixedCatalystError = exports.CONSTANTS = exports.CatalystService = void 0;
+const auth_admin_1 = require("@zcatalyst/auth-admin");
 const http_handler_1 = require("./http-handler");
 const form_data_1 = __importDefault(require("./utils/form-data"));
 exports.FormData = form_data_1.default;
+var utils_1 = require("@zcatalyst/utils");
+Object.defineProperty(exports, "CatalystService", { enumerable: true, get: function () { return utils_1.CatalystService; } });
+Object.defineProperty(exports, "CONSTANTS", { enumerable: true, get: function () { return utils_1.CONSTANTS; } });
+var utils_2 = require("@zcatalyst/utils");
+Object.defineProperty(exports, "PrefixedCatalystError", { enumerable: true, get: function () { return utils_2.PrefixedCatalystError; } });
 class Handler {
     constructor(app, component) {
         if (!app) {
-            app = new auth_1.ZCAuth().getDefaultCredentials();
-        }
-        if (!(app instanceof auth_1.CatalystApp)) {
-            throw new auth_1.CatalystAppError('INVALID_PROJECT_CREDENTIALS', 'Unable to process the project credentials. Please verify that the initialization is configured correctly.');
+            app = new auth_admin_1.ZCAuth().getDefaultCredentials();
         }
         this.app = app;
         this.component = component;

package/dist-cjs/utils/clonable-stream.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const process_1 = require("process");
 const stream_1 = require("stream");

package/dist-cjs/utils/form-data.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,11 +45,17 @@ class FormData extends stream_1.Stream {
     _getContentDisposition(value) {
         let filename = '';
         let contentDisposition = '';
-        if (value['name'] || value['path']) {
-            filename = (0, path_1.basename)(value['name'] || value['path']);
+        if (typeof value === 'object' && value !== null && ('name' in value || 'path' in value)) {
+            const val = value;
+            filename = (0, path_1.basename)(val.name || val.path || '');
         }
-        else if (value['readable'] && value.hasOwnProperty('httpVersion')) {
-            filename = (0, path_1.basename)(value['client']._httpMessage.path || '');
+        else if (typeof value === 'object' &&
+            value !== null &&
+            'readable' in value &&
+            'httpVersion' in value &&
+            'client' in value) {
+            const httpValue = value;
+            filename = (0, path_1.basename)(httpValue.client._httpMessage.path || '');
         }
         if (filename) {
             contentDisposition = 'filename="' + filename + '"';

package/dist-cjs/utils/request-agent.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@zcatalyst/utils");
 const http_1 = require("http");

package/dist-es/fetch-handler.js

@@ -4,15 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _a, _ResponseHandler_attachAppSpecificHeaders, _ResponseHandler_followZcrfTokenProtocol, _ResponseHandler_followJwtZCAuthProtocol, _ResponseHandler_sendRequest;
-import { Auth_Protocol, ConfigManager, zcAuth } from '@zcatalyst/auth-client';
-import { CONSTANTS, getServicePath, getToken } from '@zcatalyst/utils';
+import { addDefaultAppHeaders, Auth_Protocol, collectZCRFToken, ConfigStore, getToken, JWT_COOKIE_PREFIX, PROJECT_ID } from '@zcatalyst/auth-client';
+import { CONSTANTS, getServicePath } from '@zcatalyst/utils';
+import pkg from '../package.json';
+const { version } = pkg;
 import { HTTP_HEADER_MAP as HEADER_MAP, HTTP_HEADER_MAP, X_ZCSRF_TOKEN, ZD_CSRPARAM } from './utils/constants';
 import { CatalystAPIError } from './utils/errors';
 import { requestTimeout } from './utils/request-timeout';
 const { REQ_METHOD } = CONSTANTS;
-export const keepAliveSupport = {
-    supported: undefined
-};
 export class DefaultHttpResponse {
     constructor(resp) {
         this.statusCode = resp.statusCode;
@@ -33,13 +32,16 @@ export class ResponseHandler {
     static async fireGeneralRequest({ requestCore, url }, requestOptions = {}) {
         try {
             const headers = requestCore.headers || {};
+            const method = requestCore.method;
+            const methodAllowsBody = method !== REQ_METHOD.get && method !== REQ_METHOD.head;
             const options = {
-                method: requestCore.method,
+                method,
                 headers,
                 credentials: requestOptions.auth ? 'include' : 'omit',
-                body: requestCore.method !== REQ_METHOD.get ? requestCore.body : undefined
+                body: methodAllowsBody ? requestCore.body : undefined
             };
-            if (requestOptions.auth) {
+            const isExternal = requestOptions.service === "external";
+            if (requestOptions.auth && !isExternal) {
                 options.headers = await _a.attachZCAuthHeaders(headers);
                 options.headers = __classPrivateFieldGet(this, _a, "m", _ResponseHandler_attachAppSpecificHeaders).call(this, headers);
             }
@@ -63,7 +65,7 @@ export class ResponseHandler {
                         request: requestCore
                     });
                 }
-                catch (error) {
+                catch {
                     requestOptions.retry--;
                     return this.fireGeneralRequest({ requestCore, url }, requestOptions);
                 }
@@ -88,22 +90,29 @@ export class ResponseHandler {
     }
     static async wrapResponse(response, options) {
         try {
+            const method = options?.request?.method?.toUpperCase();
+            const hasNoBody = method === REQ_METHOD.head || response.status === 204 || response.status === 304;
             let data;
-            switch (options?.expecting || "json") {
-                case "buffer":
-                    data = await response.arrayBuffer();
-                    break;
-                case "raw":
-                    data = await response.blob();
-                    break;
-                case "json":
-                    data = await response.json();
-                    break;
-                case "string":
-                    data = await response.text();
-                    break;
-                default:
-                    throw new CatalystAPIError('UNSUPPORTED_RESPONSE_TYPE', `Unsupported response type: ${options?.expecting}`);
+            if (hasNoBody) {
+                data = '';
+            }
+            else {
+                switch (options?.expecting || "json") {
+                    case "buffer":
+                        data = await response.arrayBuffer();
+                        break;
+                    case "raw":
+                        data = await response.blob();
+                        break;
+                    case "json":
+                        data = await response.json();
+                        break;
+                    case "string":
+                        data = await response.text();
+                        break;
+                    default:
+                        throw new CatalystAPIError('UNSUPPORTED_RESPONSE_TYPE', `Unsupported response type: ${options?.expecting}`);
+                }
             }
             return new DefaultHttpResponse({
                 headers: response.headers,
@@ -130,23 +139,22 @@ export class ResponseHandler {
         };
         if (requestCore.method !== REQ_METHOD.get && requestCore.body !== null)
             options.body = requestCore.body;
-        const url = this.configManager.APIDomain
-            ? `${this.configManager.APIDomain}${requestCore.url}`
-            : requestCore.url;
+        const url = this.apiDomain ? `${this.apiDomain}${requestCore.url}` : requestCore.url;
         return await this.wrapResponse(await fetch(url, options));
     }
-    static attachZCAuthHeaders(headers) {
-        switch (this.configManager.AuthProtocol) {
+    static async attachZCAuthHeaders(headers) {
+        const authProtocol = ConfigStore.get('AUTH_PROTOCOL');
+        switch (authProtocol) {
             case Auth_Protocol.ZcrfTokenProtocol:
-                return __classPrivateFieldGet(_a, _a, "m", _ResponseHandler_followZcrfTokenProtocol).call(_a, headers);
+                return await __classPrivateFieldGet(_a, _a, "m", _ResponseHandler_followZcrfTokenProtocol).call(_a, headers);
             case Auth_Protocol.JwtTokenProtocol:
-                return __classPrivateFieldGet(_a, _a, "m", _ResponseHandler_followJwtZCAuthProtocol).call(_a, headers);
+                return await __classPrivateFieldGet(_a, _a, "m", _ResponseHandler_followJwtZCAuthProtocol).call(_a, headers);
             default:
                 return Promise.resolve(headers);
         }
     }
     static getJWTZCAuthToken() {
-        const conf = ConfigManager.getInstance();
+        const jwtPrefix = ConfigStore.get(JWT_COOKIE_PREFIX);
         return new Promise((resolve, reject) => {
             const jwtZCAuthToken = getToken();
             if (jwtZCAuthToken === '') {
@@ -154,7 +162,7 @@ export class ResponseHandler {
             }
             else {
                 resolve({
-                    access_token: `${conf.jwtAuthTokenPrefix} ${jwtZCAuthToken}`
+                    access_token: `${jwtPrefix} ${jwtZCAuthToken}`
                 });
             }
         });
@@ -171,8 +179,16 @@ export class ResponseHandler {
         const existingParams = url.split('?')[1] || '';
         return `${baseUrl}?${existingParams ? `${existingParams}&` : ''}${searchParams.toString()}`;
     }
-    static async send(options) {
+    static async send(options, componentName, componentVersion) {
         const headers = options.headers || {};
+        const isExternal = options.service === "external";
+        if (!isExternal) {
+            let userAgent = CONSTANTS.USER_AGENT.PREFIX + version;
+            if (componentName) {
+                userAgent += ` ${componentName}/${componentVersion || 'unknown'}`;
+            }
+            headers['X-Catalyst-User-Agent'] = userAgent;
+        }
         let data = options.data;
         if (data !== undefined) {
             switch (options.type) {
@@ -189,25 +205,24 @@ export class ResponseHandler {
                     data = formData;
                     break;
                 case "raw":
-                    data = JSON.stringify(data);
                     if (headers['Content-Type'] === undefined) {
                         headers['Content-Type'] = 'application/octet-stream';
                     }
+                    data = new Blob([data], { type: headers['Content-Type'] });
                     break;
                 default:
                     data = JSON.stringify(data);
                     headers['Content-Type'] = 'application/x-www-form-urlencoded';
-                    headers['Content-Length'] = Buffer.byteLength(data) + '';
             }
         }
-        if (this.configManager.APIDomain === null && !options.origin) {
+        if (this.apiDomain === null && !options.origin) {
             throw new CatalystAPIError('API_REQUEST_ERROR', 'Unable to get the base url');
         }
-        if (options.service !== "external" && options.path) {
-            options.path = `${getServicePath(options.service)}/project/${this.configManager.ProjectID}${options.path}`;
+        if (!isExternal && options.path) {
+            options.path = `${getServicePath(options.service)}/project/${ConfigStore.get(PROJECT_ID)}${options.path}`;
         }
         const request = {
-            url: options.url ?? `${options.origin ?? this.configManager.APIDomain}${options.path}`,
+            url: options.url ?? `${options.origin ?? this.apiDomain}${options.path}`,
             method: options.method,
             ...(data ? { body: data } : {}),
             headers
@@ -215,35 +230,20 @@ export class ResponseHandler {
         request.url = this.appendQueryString(request.url, options.qs);
         return await __classPrivateFieldGet(this, _a, "m", _ResponseHandler_sendRequest).call(this, request, {
             expecting: options.expecting,
-            auth: options.auth ?? true
+            auth: options.auth ?? true,
+            service: options.service
         });
     }
 }
 _a = ResponseHandler, _ResponseHandler_attachAppSpecificHeaders = function _ResponseHandler_attachAppSpecificHeaders(headers) {
-    const normalizedHeaders = headers;
-    const currentAccept = normalizedHeaders['Accept'];
-    if (!currentAccept) {
-        normalizedHeaders['Accept'] = 'application/vnd.catalyst.v2+json';
-    }
-    else {
-        normalizedHeaders['Accept'] = `application/vnd.catalyst.v2+json, ${currentAccept}`;
-    }
-    if (typeof this.configManager?.OrgId === 'string') {
-        normalizedHeaders['CATALYST-ORG'] = this.configManager.OrgId;
-    }
-    normalizedHeaders['CATALYST-COMPONENT'] = 'true';
+    let normalizedHeaders = headers;
+    normalizedHeaders = addDefaultAppHeaders(normalizedHeaders);
     return normalizedHeaders;
 }, _ResponseHandler_followZcrfTokenProtocol = async function _ResponseHandler_followZcrfTokenProtocol(headers) {
-    return zcAuth
-        .collectZCRFToken()
-        .then(() => {
-        headers[X_ZCSRF_TOKEN] =
-            `${ZD_CSRPARAM}=${this.configManager.CsrfToken}`;
-        return headers;
-    })
-        .catch((err) => {
-        throw new CatalystAPIError('API_ERROR', err.message, err.status);
-    });
+    await collectZCRFToken();
+    const csrfToken = ConfigStore.get('CSRF_TOKEN');
+    headers[X_ZCSRF_TOKEN] = `${ZD_CSRPARAM}=${csrfToken}`;
+    return headers;
 }, _ResponseHandler_followJwtZCAuthProtocol = async function _ResponseHandler_followJwtZCAuthProtocol(headers) {
     return this.getJWTZCAuthToken()
         .then((resp) => {
@@ -258,4 +258,4 @@ _a = ResponseHandler, _ResponseHandler_attachAppSpecificHeaders = function _Resp
     const { url, ...requestCore } = request;
     return _a.fireGeneralRequest({ url, requestCore }, options);
 };
-ResponseHandler.configManager = ConfigManager.getInstance();
+ResponseHandler.apiDomain = typeof document !== 'undefined' ? document.location.origin : '';

package/dist-es/http-handler.js

@@ -1,5 +1,5 @@
-'use strict';
-import { CONSTANTS, getServicePath, isNonEmptyString, LOGGER } from '@zcatalyst/utils';
+import { addDefaultAppHeaders } from '@zcatalyst/auth-admin';
+import { CONSTANTS, getServicePath, LOGGER } from '@zcatalyst/utils';
 import http from 'http';
 import https from 'https';
 import { ReadableStream } from 'node:stream/web';
@@ -7,12 +7,13 @@ import { stringify } from 'querystring';
 import { Readable } from 'stream';
 import { URL } from 'url';
 import { inspect } from 'util';
-import { version } from '../package.json';
+import pkg from '../package.json';
+const { version } = pkg;
 import { CatalystAPIError } from './utils/errors';
 import FORM from './utils/form-data';
 import { isHttps } from './utils/helpers';
 import RequestAgent from './utils/request-agent';
-const { PROJECT_KEY_NAME, IS_LOCAL, ENVIRONMENT_KEY_NAME, ENVIRONMENT, USER_KEY_NAME, CREDENTIAL_USER, CATALYST_ORIGIN, X_ZOHO_CATALYST_ORG_ID, USER_AGENT, APM_INSIGHT, ACCEPT_HEADER, REQ_RETRY_THRESHOLD, PROJECT_HEADER, IS_APM } = CONSTANTS;
+const { IS_LOCAL, USER_KEY_NAME, CREDENTIAL_USER, CATALYST_ORIGIN, USER_AGENT, APM_INSIGHT, ACCEPT_HEADER, REQ_RETRY_THRESHOLD, IS_APM } = CONSTANTS;
 export class DefaultHttpResponse {
     constructor(resp) {
         this.statusCode = resp.statusCode;
@@ -57,7 +58,7 @@ function rejectWithContext(reject, statusCode, data) {
         });
         return;
     }
-    catch (err) {
+    catch {
         reject({
             statusCode,
             message: inspect(data)
@@ -207,6 +208,11 @@ async function _request(transport, options, config, data, retryCount = 0) {
         if (data instanceof ReadableStream) {
             data = webStreamToNodeStream(data);
         }
+        if (typeof data === 'string' || Buffer.isBuffer(data)) {
+            req.write(data);
+            req.end();
+            return;
+        }
         data.on('error', (er) => {
             reject(er);
             req.end();
@@ -228,10 +234,14 @@ function webStreamToNodeStream(webStream) {
         }
     });
 }
-async function sendRequest(config) {
+async function sendRequest(config, componentName, componentVersion) {
     let data;
+    let userAgent = USER_AGENT.PREFIX + version;
+    if (componentName) {
+        userAgent += ` ${componentName}/${componentVersion || 'unknown'}`;
+    }
     let headers = Object.assign({
-        [USER_AGENT.KEY]: USER_AGENT.PREFIX + version
+        [USER_AGENT.KEY]: userAgent
     }, config.headers);
     if (config.data !== undefined) {
         switch (config.type) {
@@ -281,27 +291,17 @@ async function sendRequest(config) {
 export class HttpClient {
     constructor(app) {
         this.app = app;
-        this.user = CREDENTIAL_USER.admin;
     }
-    async send(req, apmTrackerName) {
+    async send(req, apmTrackerName, componentVersion) {
         req.headers = Object.assign({}, req.headers);
         req.qs = Object.assign({}, req.qs);
         req.retry = req.retry || true;
         if (this.app !== undefined && req.service !== "external") {
-            this.user = this.app.credential.getCurrentUser();
-            req.headers[PROJECT_KEY_NAME] = this.app.config.projectKey;
-            req.headers[ENVIRONMENT_KEY_NAME] = this.app.config.environment;
-            req.headers[ENVIRONMENT] = this.app.config.environment;
-            if (isNonEmptyString(process.env.X_ZOHO_CATALYST_ORG_ID)) {
-                req.headers[X_ZOHO_CATALYST_ORG_ID] = process.env.X_ZOHO_CATALYST_ORG_ID;
-            }
-            if (isNonEmptyString(this.app.config.projectSecretKey)) {
-                req.headers[PROJECT_HEADER.projectSecretKey] = this.app.config
-                    .projectSecretKey;
-            }
+            const user = this.app.credential.getCurrentUser();
+            req.headers = addDefaultAppHeaders(req.headers, this.app.config);
             req.headers[USER_KEY_NAME] = this.app.credential.getCurrentUserType();
             if (IS_LOCAL === 'true') {
-                switch (this.user) {
+                switch (user) {
                     case CREDENTIAL_USER.admin:
                         req.origin =
                             'https://' +
@@ -324,14 +324,14 @@ export class HttpClient {
             if (req.track && apmTrackerName && IS_APM === 'true') {
                 try {
                     const apminsight = await import('apminsight');
-                    resp = await apminsight.startTracker(APM_INSIGHT.tracker_name, apmTrackerName, () => sendRequest(req));
+                    resp = await apminsight.startTracker(APM_INSIGHT.tracker_name, apmTrackerName, () => sendRequest(req, apmTrackerName, componentVersion));
                 }
                 catch (err) {
                     throw new CatalystAPIError('APM_TRACKER_ERROR', 'To enable APM tracking locally, please download the apminsight package from the UI and place it in the node_modules directory of your project.', err, 400);
                 }
             }
             else {
-                resp = await sendRequest(req);
+                resp = await sendRequest(req, apmTrackerName, componentVersion);
             }
             return new DefaultHttpResponse(resp);
         }
@@ -348,6 +348,7 @@ export class AuthorizedHttpClient extends HttpClient {
         super(app);
         if (component) {
             this.componentName = component.getComponentName();
+            this.componentVersion = component.getComponentVersion?.();
         }
     }
     async send(request) {
@@ -356,6 +357,6 @@ export class AuthorizedHttpClient extends HttpClient {
         if (request.auth !== false) {
             await this.app?.authenticateRequest(requestCopy);
         }
-        return await super.send(requestCopy, this.componentName);
+        return await super.send(requestCopy, this.componentName, this.componentVersion);
     }
 }

package/dist-es/index.browser.js

@@ -1,11 +1,12 @@
-'use strict';
 import { ResponseHandler } from './fetch-handler';
+export { CatalystService, CONSTANTS } from '@zcatalyst/utils';
+export { PrefixedCatalystError } from '@zcatalyst/utils';
 export class Handler {
     constructor(app, component) {
         this.component = component;
     }
     async send(options) {
-        return (await ResponseHandler.send(options));
+        return (await ResponseHandler.send(options, this.component?.getComponentName(), this.component?.getComponentVersion?.()));
     }
 }
 export { RequestType, ResponseType } from './utils/enums';

package/dist-es/index.js

@@ -1,15 +1,13 @@
-'use strict';
-import { CatalystApp, CatalystAppError, ZCAuth } from '@zcatalyst/auth';
+import { ZCAuth } from '@zcatalyst/auth-admin';
 import { AuthorizedHttpClient } from './http-handler';
 import FormData from './utils/form-data';
+export { CatalystService, CONSTANTS } from '@zcatalyst/utils';
+export { PrefixedCatalystError } from '@zcatalyst/utils';
 export class Handler {
     constructor(app, component) {
         if (!app) {
             app = new ZCAuth().getDefaultCredentials();
         }
-        if (!(app instanceof CatalystApp)) {
-            throw new CatalystAppError('INVALID_PROJECT_CREDENTIALS', 'Unable to process the project credentials. Please verify that the initialization is configured correctly.');
-        }
         this.app = app;
         this.component = component;
     }

package/dist-es/utils/clonable-stream.js

@@ -1,4 +1,3 @@
-'use strict';
 import { nextTick } from 'process';
 import { PassThrough } from 'stream';
 function clonePiped(that) {

package/dist-es/utils/form-data.js

@@ -1,4 +1,3 @@
-'use strict';
 import { basename } from 'path';
 import { Readable, Stream } from 'stream';
 import { inspect } from 'util';
@@ -41,11 +40,17 @@ class FormData extends Stream {
     _getContentDisposition(value) {
         let filename = '';
         let contentDisposition = '';
-        if (value['name'] || value['path']) {
-            filename = basename(value['name'] || value['path']);
+        if (typeof value === 'object' && value !== null && ('name' in value || 'path' in value)) {
+            const val = value;
+            filename = basename(val.name || val.path || '');
         }
-        else if (value['readable'] && value.hasOwnProperty('httpVersion')) {
-            filename = basename(value['client']._httpMessage.path || '');
+        else if (typeof value === 'object' &&
+            value !== null &&
+            'readable' in value &&
+            'httpVersion' in value &&
+            'client' in value) {
+            const httpValue = value;
+            filename = basename(httpValue.client._httpMessage.path || '');
         }
         if (filename) {
             contentDisposition = 'filename="' + filename + '"';