asma-helpers 0.0.9 → 0.0.11

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.
@@ -1,7 +1,6 @@
1
1
  declare type ObjectType<T> = T extends string ? string : T extends boolean ? boolean : never;
2
2
  export declare function config<T>(env_var: string, default_value: T): ObjectType<T>;
3
3
  export declare function configWeb<T>(env_var: string, default_value: T): ObjectType<T>;
4
- export declare const httpToWs: (http_url?: string) => string;
5
- export declare function httpToWs2(url: string): string;
4
+ export declare function httpToWs(url: string): string;
6
5
  export {};
7
6
  //# sourceMappingURL=Config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/helpers/Config.ts"],"names":[],"mappings":"AAAA,aAAK,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,OAAO,GAAG,OAAO,GAAG,KAAK,CAAA;AAEpF,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAiB1E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAQ7E;AAaD,eAAO,MAAM,QAAQ,+BAMpB,CAAA;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,UAIpC"}
1
+ {"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/helpers/Config.ts"],"names":[],"mappings":"AAAA,aAAK,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,OAAO,GAAG,OAAO,GAAG,KAAK,CAAA;AAEpF,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAiB1E;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAQ7E;AAcD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,UAInC"}
@@ -31,21 +31,15 @@ function getDynamicSrvUrl(env_var) {
31
31
  }
32
32
  return;
33
33
  }
34
- export const httpToWs = (http_url = '') => {
35
- if (http_url.includes('local')) {
36
- return http_url.replace('http', 'ws');
37
- }
38
- return http_url.replace('https', 'wss');
39
- };
40
- export function httpToWs2(url) {
34
+ export function httpToWs(url) {
41
35
  url = absoluteUrl(url);
42
36
  return url.replace('http', 'ws').replace('https', 'wss');
43
37
  }
44
- const is_localhost = window.location.origin.includes('local') || window.location.origin.includes('172.17.0.1');
45
38
  function absoluteUrl(url) {
46
- if (!is_localhost) {
47
- url = window.location.origin + url;
39
+ if (url.startsWith('http') || url.startsWith('https')) {
40
+ return url;
48
41
  }
42
+ url = window.location.origin + url;
49
43
  return url;
50
44
  }
51
45
  //# sourceMappingURL=Config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/helpers/Config.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAI,OAAe,EAAE,aAAgB;;IACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACT,OAAO,OAAwB,CAAA;KAClC;IAED,MAAM,SAAS,GACX,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC;QACxD,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC;QAC1D,SAAS,CAAA;IAEb,IAAI,SAAS,EAAE;QACX,OAAO,CAAC,MAAA,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,SAAS,CAAC,0CAAG,OAAO,CAAC,mCAAI,aAAa,CAAkB,CAAA;KACvF;IAED,OAAO,MAAA,MAAM,CAAC,KAAK,0CAAG,OAAO,CAAkB,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,OAAe,EAAE,aAAgB;;IAC1D,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACT,OAAO,OAAwB,CAAA;KAClC;IAED,OAAO,CAAC,MAAA,MAAA,MAAM,CAAC,KAAK,0CAAG,OAAO,CAAC,mCAAI,aAAa,CAAkB,CAAA;AACtE,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACrC,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QAE1D,MAAM,OAAO,GAAG,MAAA,MAAM,CAAC,QAAQ,0CAAG,QAAQ,CAAC,CAAA;QAC3C,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAA;SACjB;KACJ;IACD,OAAM;AACV,CAAC;AACD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,QAAQ,GAAG,EAAE,EAAE,EAAE;IACtC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC5B,OAAO,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KACxC;IAED,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAC3C,CAAC,CAAA;AAED,MAAM,UAAU,SAAS,CAAC,GAAW;IACjC,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IAEtB,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;AAE9G,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,CAAC,YAAY,EAAE;QACf,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAA;KACrC;IAED,OAAO,GAAG,CAAA;AACd,CAAC"}
1
+ {"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/helpers/Config.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAI,OAAe,EAAE,aAAgB;;IACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACT,OAAO,OAAwB,CAAA;KAClC;IAED,MAAM,SAAS,GACX,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC;QACxD,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC;QAC1D,SAAS,CAAA;IAEb,IAAI,SAAS,EAAE;QACX,OAAO,CAAC,MAAA,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,SAAS,CAAC,0CAAG,OAAO,CAAC,mCAAI,aAAa,CAAkB,CAAA;KACvF;IAED,OAAO,MAAA,MAAM,CAAC,KAAK,0CAAG,OAAO,CAAkB,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,SAAS,CAAI,OAAe,EAAE,aAAgB;;IAC1D,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAEzC,IAAI,OAAO,EAAE;QACT,OAAO,OAAwB,CAAA;KAClC;IAED,OAAO,CAAC,MAAA,MAAA,MAAM,CAAC,KAAK,0CAAG,OAAO,CAAC,mCAAI,aAAa,CAAkB,CAAA;AACtE,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACrC,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QAE1D,MAAM,OAAO,GAAG,MAAA,MAAM,CAAC,QAAQ,0CAAG,QAAQ,CAAC,CAAA;QAC3C,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAA;SACjB;KACJ;IACD,OAAM;AACV,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAW;IAChC,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IAEtB,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC5B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACnD,OAAO,GAAG,CAAA;KACb;IAED,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAA;IAElC,OAAO,GAAG,CAAA;AACd,CAAC"}
@@ -2,12 +2,14 @@ import type { EnvironmentsUrls } from './EnvironmentsUrls';
2
2
  interface IBasicEnv {
3
3
  DEVELOPMENT: boolean;
4
4
  ENVIRONMENT_TO_OPERATE: string;
5
+ ADVOCA_ACCESS_URL?: string;
5
6
  }
6
7
  declare type IEnvironmentUrls = typeof EnvironmentsUrls.local;
7
8
  declare type IKeyEnvironmentUrls = keyof IEnvironmentUrls;
8
- export declare function generateEnvConfigsBindings<T extends IBasicEnv, K extends keyof T | IKeyEnvironmentUrls, S>(envs_import: Promise<{
9
+ declare type IKeyEnvironmentUrlsWs = `${IKeyEnvironmentUrls}_WS`;
10
+ export declare function generateEnvConfigsBindings<T extends IBasicEnv, K extends (keyof T | IKeyEnvironmentUrls | IKeyEnvironmentUrlsWs) & string, S>(envs_import: Promise<{
9
11
  envs: T;
10
- }>, required_vars: K[], static_env: S): {
12
+ }>, required_envs: K[], static_env: S): {
11
13
  EnvConfigsFn: () => Pick<T & {
12
14
  SRV_DIRECTORY: string;
13
15
  SRV_CALENDAR: string;
@@ -20,7 +22,7 @@ export declare function generateEnvConfigsBindings<T extends IBasicEnv, K extend
20
22
  SRV_PROXY: string;
21
23
  SRV_NOTIFICATION: string;
22
24
  SRV_AO_DIRECTORY: string;
23
- }, K> & S;
25
+ } & Record<"SRV_DIRECTORY_WS" | "SRV_CALENDAR_WS" | "SRV_PROXY_OLD_WS" | "SRV_STORAGE_WS" | "SRV_CHAT_WS" | "SRV_CONNECTOR_WS" | "SRV_ARTIFACT_WS" | "SRV_ADVOCA_WS" | "SRV_PROXY_WS" | "SRV_NOTIFICATION_WS" | "SRV_AO_DIRECTORY_WS", string>, K extends "SRV_DIRECTORY" | "SRV_CALENDAR" | "SRV_PROXY_OLD" | "SRV_STORAGE" | "SRV_CHAT" | "SRV_CONNECTOR" | "SRV_ARTIFACT" | "SRV_ADVOCA" | "SRV_PROXY" | "SRV_NOTIFICATION" | "SRV_AO_DIRECTORY" | "SRV_DIRECTORY_WS" | "SRV_CALENDAR_WS" | "SRV_PROXY_OLD_WS" | "SRV_STORAGE_WS" | "SRV_CHAT_WS" | "SRV_CONNECTOR_WS" | "SRV_ARTIFACT_WS" | "SRV_ADVOCA_WS" | "SRV_PROXY_WS" | "SRV_NOTIFICATION_WS" | "SRV_AO_DIRECTORY_WS" | keyof T ? K : never> & S;
24
26
  fetchConfigs: () => Promise<void>;
25
27
  };
26
28
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"generateEnvConfigsBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,UAAU,SAAS;IACf,WAAW,EAAE,OAAO,CAAA;IACpB,sBAAsB,EAAE,MAAM,CAAA;CACjC;AAED,aAAK,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,KAAK,CAAA;AAErD,aAAK,mBAAmB,GAAG,MAAM,gBAAgB,CAAA;AAEjD,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,mBAAmB,EAAE,CAAC,EACtG,WAAW,EAAE,OAAO,CAAC;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,EACjC,aAAa,EAAE,CAAC,EAAE,EAClB,UAAU,EAAE,CAAC;;;;;;;;;;;;;;;EAwChB"}
1
+ {"version":3,"file":"generateEnvConfigsBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE1D,UAAU,SAAS;IACf,WAAW,EAAE,OAAO,CAAA;IACpB,sBAAsB,EAAE,MAAM,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,aAAK,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,KAAK,CAAA;AAErD,aAAK,mBAAmB,GAAG,MAAM,gBAAgB,CAAA;AAEjD,aAAK,qBAAqB,GAAG,GAAG,mBAAmB,KAAK,CAAA;AAExD,wBAAgB,0BAA0B,CACtC,CAAC,SAAS,SAAS,EACnB,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,mBAAmB,GAAG,qBAAqB,CAAC,GAAG,MAAM,EAC1E,CAAC,EACH,WAAW,EAAE,OAAO,CAAC;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC;;;;;;;;;;;;;;;EAoDrE"}
@@ -1,4 +1,5 @@
1
- export function generateEnvConfigsBindings(envs_import, required_vars, static_env) {
1
+ import { httpToWs } from './Config';
2
+ export function generateEnvConfigsBindings(envs_import, required_envs, static_env) {
2
3
  let env_vars = {};
3
4
  let envConfigs = {};
4
5
  let envUrls;
@@ -6,10 +7,25 @@ export function generateEnvConfigsBindings(envs_import, required_vars, static_en
6
7
  if (Object.keys(envConfigs).length > 0) {
7
8
  return envConfigs;
8
9
  }
9
- envConfigs = required_vars.reduce((acc, curr) => {
10
- const field = env_vars[curr] || (envUrls === null || envUrls === void 0 ? void 0 : envUrls[curr]);
11
- // @ts-ignore
12
- acc[curr] = field;
10
+ envConfigs = required_envs.reduce((acc, curr) => {
11
+ if (!curr.endsWith('_WS')) {
12
+ const field = env_vars[curr] || (envUrls === null || envUrls === void 0 ? void 0 : envUrls[curr]);
13
+ // @ts-ignore
14
+ acc[curr] = field;
15
+ }
16
+ else {
17
+ const key = curr.replace('_WS', '');
18
+ const field = httpToWs(
19
+ //@ts-ignore
20
+ env_vars[key] || (envUrls === null || envUrls === void 0 ? void 0 : envUrls[key]) || '');
21
+ if (field) {
22
+ // @ts-ignore
23
+ acc[curr] = field;
24
+ }
25
+ else {
26
+ console.warn(`No URL found for ${key}`);
27
+ }
28
+ }
13
29
  return acc;
14
30
  }, envConfigs);
15
31
  envConfigs = { ...envConfigs, ...static_env };
@@ -1 +1 @@
1
- {"version":3,"file":"generateEnvConfigsBindings.js","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,0BAA0B,CACtC,WAAiC,EACjC,aAAkB,EAClB,UAAa;IAIb,IAAI,QAAQ,GAAG,EAAO,CAAA;IAEtB,IAAI,UAAU,GAAG,EAA8B,CAAA;IAE/C,IAAI,OAAqC,CAAA;IAEzC,SAAS,YAAY;QACjB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,OAAO,UAAU,CAAA;SACpB;QAED,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAe,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAA2B,CAAC,CAAA,CAAA;YAEjF,aAAa;YACb,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;YAEjB,OAAO,GAAG,CAAA;QACd,CAAC,EAAE,UAAU,CAAC,CAAA;QAEd,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;QAE7C,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,KAAK,UAAU,YAAY;QACvB,MAAM,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC,IAAI,CAAA;QAErC,QAAQ,GAAG,IAAI,CAAA;QAEf,IAAI,QAAQ,CAAC,WAAW,EAAE;YACtB,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAA;SAC1F;IACL,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAA;AACzC,CAAC"}
1
+ {"version":3,"file":"generateEnvConfigsBindings.js","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAenC,MAAM,UAAU,0BAA0B,CAIxC,WAAiC,EAAE,aAAkB,EAAE,UAAa;IAGlE,IAAI,QAAQ,GAAG,EAAO,CAAA;IAEtB,IAAI,UAAU,GAAG,EAAoE,CAAA;IAErF,IAAI,OAAqC,CAAA;IAEzC,SAAS,YAAY;QACjB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,OAAO,UAAU,CAAA;SACpB;QAED,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAe,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,IAA2B,CAAC,CAAA,CAAA;gBACjF,aAAa;gBACb,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;aACpB;iBAAM;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;gBACnC,MAAM,KAAK,GAAG,QAAQ;gBAClB,YAAY;gBACZ,QAAQ,CAAC,GAAG,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAA0B,CAAC,CAAA,IAAI,EAAE,CAC/D,CAAA;gBACD,IAAI,KAAK,EAAE;oBACP,aAAa;oBACb,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;iBACpB;qBAAM;oBACH,OAAO,CAAC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAA;iBAC1C;aACJ;YAED,OAAO,GAAG,CAAA;QACd,CAAC,EAAE,UAAU,CAAC,CAAA;QAEd,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,UAAU,EAAE,CAAA;QAE7C,OAAO,UAAU,CAAA;IACrB,CAAC;IAED,KAAK,UAAU,YAAY;QACvB,MAAM,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC,IAAI,CAAA;QAErC,QAAQ,GAAG,IAAI,CAAA;QAEf,IAAI,QAAQ,CAAC,WAAW,EAAE;YACtB,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAA;SAC1F;IACL,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAA;AACzC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asma-helpers",
3
- "version": "0.0.9",
3
+ "version": "0.0.11",
4
4
  "description": "helpers methods for asma",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib",
@@ -40,26 +40,19 @@ function getDynamicSrvUrl(env_var: string) {
40
40
  }
41
41
  return
42
42
  }
43
- export const httpToWs = (http_url = '') => {
44
- if (http_url.includes('local')) {
45
- return http_url.replace('http', 'ws')
46
- }
47
-
48
- return http_url.replace('https', 'wss')
49
- }
50
43
 
51
- export function httpToWs2(url: string) {
44
+ export function httpToWs(url: string) {
52
45
  url = absoluteUrl(url)
53
46
 
54
47
  return url.replace('http', 'ws').replace('https', 'wss')
55
48
  }
56
49
 
57
- const is_localhost = window.location.origin.includes('local') || window.location.origin.includes('172.17.0.1')
58
-
59
50
  function absoluteUrl(url: string) {
60
- if (!is_localhost) {
61
- url = window.location.origin + url
51
+ if (url.startsWith('http') || url.startsWith('https')) {
52
+ return url
62
53
  }
63
54
 
55
+ url = window.location.origin + url
56
+
64
57
  return url
65
58
  }
@@ -1,24 +1,28 @@
1
+ import { httpToWs } from './Config'
1
2
  import type { EnvironmentsUrls } from './EnvironmentsUrls'
2
3
 
3
4
  interface IBasicEnv {
4
5
  DEVELOPMENT: boolean
5
6
  ENVIRONMENT_TO_OPERATE: string
7
+ ADVOCA_ACCESS_URL?: string
6
8
  }
7
9
 
8
10
  type IEnvironmentUrls = typeof EnvironmentsUrls.local
9
11
 
10
12
  type IKeyEnvironmentUrls = keyof IEnvironmentUrls
11
13
 
12
- export function generateEnvConfigsBindings<T extends IBasicEnv, K extends keyof T | IKeyEnvironmentUrls, S>(
13
- envs_import: Promise<{ envs: T }>,
14
- required_vars: K[],
15
- static_env: S,
16
- ) {
17
- type IEnvConfigs = T & IEnvironmentUrls
14
+ type IKeyEnvironmentUrlsWs = `${IKeyEnvironmentUrls}_WS`
15
+
16
+ export function generateEnvConfigsBindings<
17
+ T extends IBasicEnv,
18
+ K extends (keyof T | IKeyEnvironmentUrls | IKeyEnvironmentUrlsWs) & string,
19
+ S,
20
+ >(envs_import: Promise<{ envs: T }>, required_envs: K[], static_env: S) {
21
+ type IEnvConfigs = T & IEnvironmentUrls & Record<IKeyEnvironmentUrlsWs, string>
18
22
 
19
23
  let env_vars = {} as T
20
24
 
21
- let envConfigs = {} as Pick<IEnvConfigs, K> & S
25
+ let envConfigs = {} as Pick<IEnvConfigs, K extends keyof IEnvConfigs ? K : never> & S
22
26
 
23
27
  let envUrls: IEnvironmentUrls | undefined
24
28
 
@@ -27,11 +31,24 @@ export function generateEnvConfigsBindings<T extends IBasicEnv, K extends keyof
27
31
  return envConfigs
28
32
  }
29
33
 
30
- envConfigs = required_vars.reduce((acc, curr) => {
31
- const field = env_vars[curr as keyof T] || envUrls?.[curr as IKeyEnvironmentUrls]
32
-
33
- // @ts-ignore
34
- acc[curr] = field
34
+ envConfigs = required_envs.reduce((acc, curr) => {
35
+ if (!curr.endsWith('_WS')) {
36
+ const field = env_vars[curr as keyof T] || envUrls?.[curr as IKeyEnvironmentUrls]
37
+ // @ts-ignore
38
+ acc[curr] = field
39
+ } else {
40
+ const key = curr.replace('_WS', '')
41
+ const field = httpToWs(
42
+ //@ts-ignore
43
+ env_vars[key] || envUrls?.[key as IKeyEnvironmentUrls] || '',
44
+ )
45
+ if (field) {
46
+ // @ts-ignore
47
+ acc[curr] = field
48
+ } else {
49
+ console.warn(`No URL found for ${key}`)
50
+ }
51
+ }
35
52
 
36
53
  return acc
37
54
  }, envConfigs)