@io-orkes/conductor-javascript 2.1.3 → 2.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.mts CHANGED
@@ -1442,6 +1442,7 @@ declare class HumanTaskResourceService {
1442
1442
 
1443
1443
  interface ConductorClientAPIConfig extends Omit<OpenAPIConfig, "BASE"> {
1444
1444
  serverUrl: string;
1445
+ useEnvVars: boolean;
1445
1446
  }
1446
1447
  declare class ConductorClient {
1447
1448
  readonly eventResource: EventResourceService;
package/dist/index.d.ts CHANGED
@@ -1442,6 +1442,7 @@ declare class HumanTaskResourceService {
1442
1442
 
1443
1443
  interface ConductorClientAPIConfig extends Omit<OpenAPIConfig, "BASE"> {
1444
1444
  serverUrl: string;
1445
+ useEnvVars: boolean;
1445
1446
  }
1446
1447
  declare class ConductorClient {
1447
1448
  readonly eventResource: EventResourceService;
package/dist/index.js CHANGED
@@ -1742,15 +1742,15 @@ var getQueryString = (params) => {
1742
1742
  const append = (key, value) => {
1743
1743
  qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
1744
1744
  };
1745
- const process = (key, value) => {
1745
+ const process2 = (key, value) => {
1746
1746
  if (isDefined(value)) {
1747
1747
  if (Array.isArray(value)) {
1748
1748
  value.forEach((v) => {
1749
- process(key, v);
1749
+ process2(key, v);
1750
1750
  });
1751
1751
  } else if (typeof value === "object") {
1752
1752
  Object.entries(value).forEach(([k, v]) => {
1753
- process(`${key}[${k}]`, v);
1753
+ process2(`${key}[${k}]`, v);
1754
1754
  });
1755
1755
  } else {
1756
1756
  append(key, value);
@@ -1758,7 +1758,7 @@ var getQueryString = (params) => {
1758
1758
  }
1759
1759
  };
1760
1760
  Object.entries(params).forEach(([key, value]) => {
1761
- process(key, value);
1761
+ process2(key, value);
1762
1762
  });
1763
1763
  if (qs.length > 0) {
1764
1764
  return `?${qs.join("&")}`;
@@ -1782,7 +1782,7 @@ var getUrl = (config, options) => {
1782
1782
  var getFormData = (options) => {
1783
1783
  if (options.formData) {
1784
1784
  const formData = new FormData();
1785
- const process = (key, value) => {
1785
+ const process2 = (key, value) => {
1786
1786
  if (isString(value) || isBlob(value)) {
1787
1787
  formData.append(key, value);
1788
1788
  } else {
@@ -1791,9 +1791,9 @@ var getFormData = (options) => {
1791
1791
  };
1792
1792
  Object.entries(options.formData).filter(([_, value]) => isDefined(value)).forEach(([key, value]) => {
1793
1793
  if (Array.isArray(value)) {
1794
- value.forEach((v) => process(key, v));
1794
+ value.forEach((v) => process2(key, v));
1795
1795
  } else {
1796
- process(key, value);
1796
+ process2(key, value);
1797
1797
  }
1798
1798
  });
1799
1799
  return formData;
@@ -2279,6 +2279,17 @@ var HumanTaskResourceService = class {
2279
2279
 
2280
2280
  // src/common/open-api/ConductorClient.ts
2281
2281
  var defaultRequestHandler = (request3, config, options) => request3(config, options);
2282
+ var getServerBaseURL = (config) => {
2283
+ if (config?.useEnvVars) {
2284
+ if (!process.env.CONDUCTOR_SERVER_URL) {
2285
+ throw new Error(
2286
+ "Environment variable CONDUCTOR_SERVER_URL is not defined."
2287
+ );
2288
+ }
2289
+ return process.env.CONDUCTOR_SERVER_URL;
2290
+ }
2291
+ return config?.serverUrl ?? "http://localhost:8080";
2292
+ };
2282
2293
  var ConductorClient = class {
2283
2294
  eventResource;
2284
2295
  healthCheckResource;
@@ -2294,7 +2305,7 @@ var ConductorClient = class {
2294
2305
  token;
2295
2306
  constructor(config, requestHandler = defaultRequestHandler) {
2296
2307
  const resolvedConfig = {
2297
- BASE: config?.serverUrl ?? "http://localhost:8080",
2308
+ BASE: getServerBaseURL(config),
2298
2309
  VERSION: config?.VERSION ?? "0",
2299
2310
  WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
2300
2311
  CREDENTIALS: config?.CREDENTIALS ?? "include",
@@ -4043,6 +4054,16 @@ var baseOrkesConductorClient = (fetchFn, baseRequestHandler = defaultRequestHand
4043
4054
  method: "POST"
4044
4055
  });
4045
4056
  return async (config, requestHandler = baseRequestHandler) => {
4057
+ if (config?.useEnvVars) {
4058
+ if (!process.env.CONDUCTOR_SERVER_URL) {
4059
+ throw new Error(
4060
+ "Environment variable CONDUCTOR_SERVER_URL is not defined."
4061
+ );
4062
+ }
4063
+ config.serverUrl = process.env.CONDUCTOR_SERVER_URL;
4064
+ config.keyId = process.env.CONDUCTOR_AUTH_KEY;
4065
+ config.keySecret = process.env.CONDUCTOR_AUTH_SECRET;
4066
+ }
4046
4067
  if (config?.keySecret != null && config?.keyId != null) {
4047
4068
  const {
4048
4069
  serverUrl,
@@ -4111,15 +4132,15 @@ var getQueryString2 = (params) => {
4111
4132
  const append = (key, value) => {
4112
4133
  qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
4113
4134
  };
4114
- const process = (key, value) => {
4135
+ const process2 = (key, value) => {
4115
4136
  if (isDefined2(value)) {
4116
4137
  if (Array.isArray(value)) {
4117
4138
  value.forEach((v) => {
4118
- process(key, v);
4139
+ process2(key, v);
4119
4140
  });
4120
4141
  } else if (typeof value === "object") {
4121
4142
  Object.entries(value).forEach(([k, v]) => {
4122
- process(`${key}[${k}]`, v);
4143
+ process2(`${key}[${k}]`, v);
4123
4144
  });
4124
4145
  } else {
4125
4146
  append(key, value);
@@ -4127,7 +4148,7 @@ var getQueryString2 = (params) => {
4127
4148
  }
4128
4149
  };
4129
4150
  Object.entries(params).forEach(([key, value]) => {
4130
- process(key, value);
4151
+ process2(key, value);
4131
4152
  });
4132
4153
  if (qs.length > 0) {
4133
4154
  return `?${qs.join("&")}`;
@@ -4151,7 +4172,7 @@ var getUrl2 = (config, options) => {
4151
4172
  var getFormData2 = (options) => {
4152
4173
  if (options.formData) {
4153
4174
  const formData = new FormData();
4154
- const process = (key, value) => {
4175
+ const process2 = (key, value) => {
4155
4176
  if (isString2(value) || isBlob2(value)) {
4156
4177
  formData.append(key, value);
4157
4178
  } else {
@@ -4160,9 +4181,9 @@ var getFormData2 = (options) => {
4160
4181
  };
4161
4182
  Object.entries(options.formData).filter(([_, value]) => isDefined2(value)).forEach(([key, value]) => {
4162
4183
  if (Array.isArray(value)) {
4163
- value.forEach((v) => process(key, v));
4184
+ value.forEach((v) => process2(key, v));
4164
4185
  } else {
4165
- process(key, value);
4186
+ process2(key, value);
4166
4187
  }
4167
4188
  });
4168
4189
  return formData;