@futdevpro/nts-dynamo 1.11.32 → 1.11.34

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.
Files changed (23) hide show
  1. package/build/_collections/get-environment-settings.util.js +2 -2
  2. package/build/_collections/get-environment-settings.util.js.map +1 -1
  3. package/build/_models/control-models/api-call-params.control-model.d.ts +12 -1
  4. package/build/_models/control-models/api-call-params.control-model.d.ts.map +1 -1
  5. package/build/_models/control-models/api-call-params.control-model.js.map +1 -1
  6. package/build/_modules/open-ai/_services/oai-chunk.service-base.js +14 -14
  7. package/build/_modules/open-ai/_services/oai-chunk.service-base.js.map +1 -1
  8. package/build/_services/core/api.service.d.ts +1 -1
  9. package/build/_services/core/api.service.d.ts.map +1 -1
  10. package/build/_services/core/api.service.js +40 -11
  11. package/build/_services/core/api.service.js.map +1 -1
  12. package/build/_services/core/api.service.spec.js +45 -10
  13. package/build/_services/core/api.service.spec.js.map +1 -1
  14. package/package.json +3 -3
  15. package/src/_collections/get-environment-settings.util.ts +1 -1
  16. package/src/_models/control-models/api-call-params.control-model.ts +12 -1
  17. package/src/_modules/open-ai/_services/oai-chunk.service-base.ts +14 -14
  18. package/src/_services/core/api.service.spec.ts +52 -15
  19. package/src/_services/core/api.service.ts +55 -14
  20. package/src/_services/server/app.server.ts +1 -1
  21. package/test.ts +0 -0
  22. package/test2.js +1 -0
  23. package/test2.ts +0 -0
package/build/_collections/get-environment-settings.util.js CHANGED
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DyNTS_getEnvironment_settings = DyNTS_getEnvironment_settings;
4
4
  const tslib_1 = require("tslib");
5
5
  const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
6
- const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
6
+ const dotenv = tslib_1.__importStar(require("dotenv"));
7
7
  function DyNTS_getEnvironment_settings() {
8
- dotenv_1.default.config();
8
+ dotenv.config();
9
9
  let env = process.env.ENV ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT ?? fsm_dynamo_1.DyFM_EnvironmentFlag.local;
10
10
  env = env.toLocaleLowerCase();
11
11
  if (!fsm_dynamo_1.DyFM_allEnvironmentFlags.includes(env)) {
package/build/_collections/get-environment-settings.util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;AAIA,sEA4CC;;AAhDD,sDAAiG;AAEjG,4DAA4B;AAE5B,SAAgB,6BAA6B;IAC3C,gBAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;SAC9C;QAED,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS;QAExD,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YACnC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED;;;;;;;;;aASK;KACN,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"get-environment-settings.util.js","sourceRoot":"","sources":["../../src/_collections/get-environment-settings.util.ts"],"names":[],"mappings":";;AAIA,sEA4CC;;AAhDD,sDAAiG;AAEjG,uDAAiC;AAEjC,SAAgB,6BAA6B;IAC3C,MAAM,CAAC,MAAM,EAAE,CAAA;IAEf,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,iCAAoB,CAAC,KAAK,CAAC;IAC3G,GAAG,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAE9B,IAAI,CAAC,qCAAwB,CAAC,QAAQ,CAAC,GAA2B,CAAC,EAAE,CAAC;QACpE,qBAAQ,CAAC,KAAK,CAAC,yBAAyB,GAAG,8BAA8B,CAAC,CAAC;QAC3E,GAAG,GAAG,iCAAoB,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,OAAO;QACL,WAAW,EAAE,qCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC,CAAC;YACvF,OAAO,CAAC,GAAG,CAAC,GAA2B,CAAC,CAAC;YACzC,iCAAoB,CAAC,KAAK;QAG5B,OAAO,EAAE;YACP,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACpC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAC3C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;SAC9C;QAED,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS;QAExD,MAAM,EAAE;YACN,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YACnC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;SAC1C;QAED;;;;;;;;;aASK;KACN,CAAA;AACH,CAAC"}
package/build/_models/control-models/api-call-params.control-model.d.ts CHANGED
@@ -1,4 +1,15 @@
1
1
  import { DyFM_HttpCallType, DyFM_HttpResponseType } from '@futdevpro/fsm-dynamo';
2
+ export interface DyNTS_AxiosSettings {
3
+ headers?: {
4
+ [header: string]: string | string[];
5
+ };
6
+ httpAgent?: any;
7
+ httpsAgent?: any;
8
+ timeout?: number;
9
+ maxRedirects?: number;
10
+ withCredentials?: boolean;
11
+ responseType?: DyFM_HttpResponseType;
12
+ }
2
13
  /**
3
14
  * API call params,
4
15
  * such as
@@ -33,7 +44,7 @@ export declare class DyNTS_ApiCall_Params {
33
44
  /**
34
45
  * this setting will be passed to the axios http call
35
46
  */
36
- httpOptions: any;
47
+ httpOptions: any | DyNTS_AxiosSettings;
37
48
  pathParamKeys: string[];
38
49
  readonly stack: string;
39
50
  constructor(
package/build/_models/control-models/api-call-params.control-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-call-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,iBAAiB,EAAE,qBAAqB,EAAa,MAAM,uBAAuB,CAAC;AAG/H;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAyB;IAChD;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAS;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,CAAM;IAEtB,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;;IAGrB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC;CA2CrC;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,OAAO,CAAC,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;QACrC,OAAO,CAAC,EAAE;YACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;SACrC,CAAC;QACF,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAA;KAC1B;CAQJ"}
1
+ {"version":3,"file":"api-call-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAqC,iBAAiB,EAAE,qBAAqB,EAAa,MAAM,uBAAuB,CAAC;AAI/H,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IAClD,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,qBAAqB,CAAC;CACtC;AAED;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAyB;IAChD;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAS;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,GAAG,mBAAmB,CAAM;IAE5C,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;;IAGrB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC;CA2CrC;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,OAAO,CAAC,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;QACrC,OAAO,CAAC,EAAE;YACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;SACrC,CAAC;QACF,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAA;KAC1B;CAQJ"}
package/build/_models/control-models/api-call-params.control-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-call-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":";;;AACA,sDAA+H;AAC/H,oFAAiF;AAEjF;;;;;;GAMG;AACH,MAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,CAAS;IACb;;OAEG;IACH,IAAI,GAAsB,8BAAiB,CAAC,GAAG,CAAC;IAChD;;;;OAIG;IACH,OAAO,CAAS;IAChB;;;OAGG;IACH,QAAQ,CAAS;IAEjB;;OAEG;IACH,eAAe,GAAY,KAAK,CAAC;IACjC;;OAEG;IACH,WAAW,GAAQ,EAAE,CAAC;IAEtB,aAAa,GAAa,EAAE,CAAC;IAEpB,KAAK,CAAS;IAEvB;IACE;;OAEG;IACH,GAAkC;QAElC,IAAI,CAAC,KAAK,GAAG,IAAA,8CAAiC,GAAE,CAAC;QAEjD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,4EAA4E,EAC5E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,0BAA0B;YAC1B,qBAAQ,CAAC,KAAK,CACZ,6EAA6E,EAC7E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,6CAAqB,CAAC,OAAO,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,yDAAyD,EACzD,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,qBAAQ,CAAC,IAAI,CACX,iFAAiF,GAAG,CAAC,QAAQ,GAAG;gBAChG,qDAAqD,CACtD,CAAC;YACF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;iBACzC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAjFD,oDAiFC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IAC5B,YAAY,CAAyB;IACrC,OAAO,CAEL;IACF,OAAO,CAAU;IACjB,cAAc,CAAW;IACzB,eAAe,CAAW;IAE1B,YACE,GAQC;QAED,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,CAAC;CACF;AA1BD,8CA0BC"}
1
+ {"version":3,"file":"api-call-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":";;;AACA,sDAA+H;AAC/H,oFAAiF;AAajF;;;;;;GAMG;AACH,MAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,CAAS;IACb;;OAEG;IACH,IAAI,GAAsB,8BAAiB,CAAC,GAAG,CAAC;IAChD;;;;OAIG;IACH,OAAO,CAAS;IAChB;;;OAGG;IACH,QAAQ,CAAS;IAEjB;;OAEG;IACH,eAAe,GAAY,KAAK,CAAC;IACjC;;OAEG;IACH,WAAW,GAA8B,EAAE,CAAC;IAE5C,aAAa,GAAa,EAAE,CAAC;IAEpB,KAAK,CAAS;IAEvB;IACE;;OAEG;IACH,GAAkC;QAElC,IAAI,CAAC,KAAK,GAAG,IAAA,8CAAiC,GAAE,CAAC;QAEjD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,4EAA4E,EAC5E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,0BAA0B;YAC1B,qBAAQ,CAAC,KAAK,CACZ,6EAA6E,EAC7E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,6CAAqB,CAAC,OAAO,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,yDAAyD,EACzD,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,qBAAQ,CAAC,IAAI,CACX,iFAAiF,GAAG,CAAC,QAAQ,GAAG;gBAChG,qDAAqD,CACtD,CAAC;YACF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;iBACzC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAjFD,oDAiFC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IAC5B,YAAY,CAAyB;IACrC,OAAO,CAEL;IACF,OAAO,CAAU;IACjB,cAAc,CAAW;IACzB,eAAe,CAAW;IAE1B,YACE,GAQC;QAED,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,CAAC;CACF;AA1BD,8CA0BC"}
package/build/_modules/open-ai/_services/oai-chunk.service-base.js CHANGED
@@ -24,7 +24,7 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
24
24
  }
25
25
  else {
26
26
  await this.deleteData(pageCompareResult.oldChunks[i]._id, true).catch(error => {
27
- fsm_dynamo_1.DyFM_Error.logSimple('❌ Chunk not deleted', error);
27
+ fsm_dynamo_1.DyFM_Error.logSimple(`❌ ${this.dataParams.dataName} Chunk not deleted`, error);
28
28
  });
29
29
  }
30
30
  }
@@ -35,17 +35,17 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
35
35
  chunk.na */
36
36
  chunk.path = chunk.allFlaggedParents.join('/');
37
37
  if (this.debugLog) {
38
- fsm_dynamo_1.DyFM_Log.H_info(`✅ saving Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
38
+ fsm_dynamo_1.DyFM_Log.H_info(`✅ saving ${this.dataParams.dataName} Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
39
39
  chunk: chunk,
40
40
  });
41
41
  /* DyFM_Log.H_warn(`STOP`);
42
42
  await DyFM_Async.wait(10_000 * minute); */
43
43
  }
44
44
  await this.saveData(chunk, false, true);
45
- fsm_dynamo_1.DyFM_Log.info(`✅ Chunk saved: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`);
45
+ fsm_dynamo_1.DyFM_Log.info(`✅ ${this.dataParams.dataName} Chunk saved: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`);
46
46
  }
47
47
  });
48
- fsm_dynamo_1.DyFM_Log.success(`✅ Chunks updated(SAVED) for page: ${pageCompareResult.subjectPage.name}`);
48
+ fsm_dynamo_1.DyFM_Log.success(`✅ ${this.dataParams.dataName} Chunks updated(SAVED) for page: ${pageCompareResult.subjectPage.name}`);
49
49
  }
50
50
  catch (error) {
51
51
  throw new fsm_dynamo_1.DyFM_Error({
@@ -57,12 +57,12 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
57
57
  async comparePage(page, issuer) {
58
58
  try {
59
59
  if (this.debugLog) {
60
- fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing page: ${page.name}`);
60
+ fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} page: ${page.name}`);
61
61
  }
62
62
  if (!page?.allFlaggedParentsMerged) {
63
- fsm_dynamo_1.DyFM_Log.T_error(`❌ allFlaggedParentsMerged is not set (${page.name})`, JSON.stringify(page, null, 2));
63
+ fsm_dynamo_1.DyFM_Log.T_error(`❌ ${this.dataParams.dataName} allFlaggedParentsMerged is not set (${page.name})`, JSON.stringify(page, null, 2));
64
64
  throw new fsm_dynamo_1.DyFM_Error({
65
- ...this.getDefaultErrorSettings('comparePage', new Error(`allFlaggedParentsMerged is not set (${page.name})`)),
65
+ ...this.getDefaultErrorSettings('comparePage', new Error(`${this.dataParams.dataName} allFlaggedParentsMerged is not set (${page.name})`)),
66
66
  errorCode: 'DCH-CSB-CP0',
67
67
  });
68
68
  }
@@ -80,7 +80,7 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
80
80
  }); */
81
81
  if (compareResults.every(result => result.result === oai_compare_result_type_enum_1.DyNTS_OAI_CompareResult_Type.equal)) {
82
82
  if (this.debugLog) {
83
- fsm_dynamo_1.DyFM_Log.info(`✅ Page is equal: ${page.name}`);
83
+ fsm_dynamo_1.DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is equal: ${page.name}`);
84
84
  }
85
85
  return {
86
86
  result: oai_compare_result_type_enum_1.DyNTS_OAI_CompareResult_Type.equal,
@@ -93,7 +93,7 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
93
93
  }
94
94
  if (compareResults.every(result => result.result === oai_compare_result_type_enum_1.DyNTS_OAI_CompareResult_Type.new)) {
95
95
  if (this.debugLog) {
96
- fsm_dynamo_1.DyFM_Log.info(`✅ Page is new: ${page.name}`);
96
+ fsm_dynamo_1.DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is new: ${page.name}`);
97
97
  }
98
98
  return {
99
99
  result: oai_compare_result_type_enum_1.DyNTS_OAI_CompareResult_Type.new,
@@ -105,7 +105,7 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
105
105
  };
106
106
  }
107
107
  if (this.debugLog) {
108
- fsm_dynamo_1.DyFM_Log.info(`✅ Page is modified: ${page.name}`);
108
+ fsm_dynamo_1.DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is modified: ${page.name}`);
109
109
  }
110
110
  return {
111
111
  result: oai_compare_result_type_enum_1.DyNTS_OAI_CompareResult_Type.modified,
@@ -126,14 +126,14 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
126
126
  async compareChunks(chunks, oldChunks) {
127
127
  try {
128
128
  if (this.debugLog) {
129
- fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing chunks: ${chunks.length}`);
129
+ fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} chunks: ${chunks.length}`);
130
130
  }
131
131
  if (chunks.length === 0) {
132
132
  return [];
133
133
  }
134
134
  if (chunks.some(chunk => !chunk.path)) {
135
135
  throw new fsm_dynamo_1.DyFM_Error({
136
- ...this.getDefaultErrorSettings('compareChunks', new Error('allFlaggedParentsMerged is not set')),
136
+ ...this.getDefaultErrorSettings('compareChunks', new Error(`${this.dataParams.dataName} allFlaggedParentsMerged is not set`)),
137
137
  errorCode: 'DCH-CSB-CC0',
138
138
  });
139
139
  }
@@ -155,13 +155,13 @@ class DyNTS_OAI_Chunk_DataServiceBase extends oai_vector_data_service_1.DyNTS_OA
155
155
  async compareChunk(newChunk, oldChunk) {
156
156
  try {
157
157
  if (this.debugLog) {
158
- fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing chunk: ${newChunk.chunkIndex}`);
158
+ fsm_dynamo_1.DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} chunk: ${newChunk.chunkIndex}`);
159
159
  }
160
160
  oldChunk ??= await this.findData({
161
161
  path: newChunk.path,
162
162
  chunkIndex: newChunk.chunkIndex,
163
163
  });
164
- /* DyFM_Log.H_info(`✅ Comparing chunk: ${newChunk.chunkIndex}`, {
164
+ /* DyFM_Log.H_info(`✅ Comparing ${this.dataParams.dataName} chunk: ${newChunk.chunkIndex}`, {
165
165
  newChunk: newChunk,
166
166
  oldChunk: oldChunk,
167
167
  new: !oldChunk,
package/build/_modules/open-ai/_services/oai-chunk.service-base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oai-chunk.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/open-ai/_services/oai-chunk.service-base.ts"],"names":[],"mappings":"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"}
package/build/_services/core/api.service.d.ts CHANGED
@@ -39,7 +39,7 @@ export declare class DyNTS_ApiService {
39
39
  private static delete;
40
40
  private static get;
41
41
  private static logEvent;
42
- private static setupHeaders;
42
+ private static setupAxiosConfig;
43
43
  private static setupPathParams;
44
44
  private static _getDefaultErrorSettings;
45
45
  }
package/build/_services/core/api.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBA8JL,YAAY;mBA4BZ,MAAM;mBAsBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,YAAY;IAoB3B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
1
+ {"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBA8JL,YAAY;mBA4BZ,MAAM;mBAwBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA2D/B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
package/build/_services/core/api.service.js CHANGED
@@ -51,8 +51,8 @@ class DyNTS_ApiService {
51
51
  }
52
52
  });
53
53
  }
54
- if (callParams?.httpOptions?.headers) {
55
- this.setupHeaders(callParams, axios);
54
+ if (callParams?.httpOptions) {
55
+ this.setupAxiosConfig(callParams, axios);
56
56
  }
57
57
  if (inputParams?.pathParams) {
58
58
  url = this.setupPathParams(inputParams.pathParams, url);
@@ -291,6 +291,9 @@ class DyNTS_ApiService {
291
291
  if (callParams.getFullResponse) {
292
292
  return res;
293
293
  }
294
+ else {
295
+ return res.data;
296
+ }
294
297
  });
295
298
  }
296
299
  static async get(axios, url, callParams) {
@@ -328,17 +331,43 @@ class DyNTS_ApiService {
328
331
  });
329
332
  }
330
333
  }
331
- static setupHeaders(callParams, axios) {
332
- for (const headerKey in callParams.httpOptions.headers) {
333
- if (callParams.httpOptions.headers[headerKey]) {
334
+ static setupAxiosConfig(callParams, axios) {
335
+ // Ensure axios.defaults exists
336
+ if (!axios.defaults) {
337
+ fsm_dynamo_1.DyFM_Log.error(`ERROR: axios.defaults is undefined in setupAxiosConfig for call (cant set headers and other options): "${callParams.name}"`, '\n stack:', callParams.stack);
338
+ return;
339
+ }
340
+ // Set headers
341
+ if (callParams.httpOptions?.headers) {
342
+ axios.defaults.headers.common ??= {};
343
+ for (const headerKey in callParams.httpOptions.headers) {
344
+ if (!callParams.httpOptions.headers[headerKey]) {
345
+ throw new fsm_dynamo_1.DyFM_Error({
346
+ ...this._getDefaultErrorSettings('setupHeaders', new Error(`missing header: ${headerKey}`)),
347
+ errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SH0`,
348
+ });
349
+ }
334
350
  axios.defaults.headers.common[headerKey] = callParams.httpOptions.headers[headerKey];
335
351
  }
336
- else {
337
- throw new fsm_dynamo_1.DyFM_Error({
338
- ...this._getDefaultErrorSettings('setupHeaders', new Error(`missing header: ${headerKey}`)),
339
- errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SH0`,
340
- });
341
- }
352
+ }
353
+ // Set other Axios configuration options
354
+ if (callParams.httpOptions?.httpsAgent) {
355
+ axios.defaults.httpsAgent = callParams.httpOptions.httpsAgent;
356
+ }
357
+ if (callParams.httpOptions?.httpAgent) {
358
+ axios.defaults.httpAgent = callParams.httpOptions.httpAgent;
359
+ }
360
+ if (callParams.httpOptions?.timeout !== undefined) {
361
+ axios.defaults.timeout = callParams.httpOptions.timeout;
362
+ }
363
+ if (callParams.httpOptions?.maxRedirects !== undefined) {
364
+ axios.defaults.maxRedirects = callParams.httpOptions.maxRedirects;
365
+ }
366
+ if (callParams.httpOptions?.withCredentials !== undefined) {
367
+ axios.defaults.withCredentials = callParams.httpOptions.withCredentials;
368
+ }
369
+ if (callParams.httpOptions?.responseType !== undefined) {
370
+ axios.defaults.responseType = callParams.httpOptions.responseType;
342
371
  }
343
372
  }
344
373
  static setupPathParams(pathParams, url) {
package/build/_services/core/api.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
package/build/_services/core/api.service.spec.js CHANGED
@@ -25,49 +25,84 @@ describe('| DyNTS_ApiService', () => {
25
25
  body: { key: 'value' },
26
26
  };
27
27
  });
28
+ // Helper function to create a complete mock Axios instance
29
+ const createMockAxiosInstance = (methods = {}) => {
30
+ return {
31
+ defaults: {
32
+ headers: {
33
+ common: {},
34
+ delete: {},
35
+ get: {},
36
+ head: {},
37
+ post: {},
38
+ put: {},
39
+ patch: {},
40
+ },
41
+ httpsAgent: undefined,
42
+ httpAgent: undefined,
43
+ timeout: undefined,
44
+ maxRedirects: undefined,
45
+ withCredentials: undefined,
46
+ responseType: undefined,
47
+ },
48
+ get: jasmine.createSpy('get'),
49
+ post: jasmine.createSpy('post'),
50
+ put: jasmine.createSpy('put'),
51
+ patch: jasmine.createSpy('patch'),
52
+ delete: jasmine.createSpy('delete'),
53
+ ...methods,
54
+ };
55
+ };
28
56
  it('| should make a GET request successfully', async () => {
29
57
  callParams.type = fsm_dynamo_1.DyFM_HttpCallType.get;
30
58
  const response = { data: { success: true } };
31
- spyOn(axios_1.default, 'create').and.returnValue({
32
- get: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
59
+ const mockAxios = createMockAxiosInstance({
60
+ get: jasmine.createSpy('get').and.returnValue(Promise.resolve(response)),
33
61
  });
62
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
34
63
  const result = await api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams);
35
64
  expect(result).toEqual(response.data);
36
65
  });
37
66
  it('| should handle a POST request successfully', async () => {
38
67
  callParams.type = fsm_dynamo_1.DyFM_HttpCallType.post;
39
68
  const response = { data: { success: true } };
40
- spyOn(axios_1.default, 'create').and.returnValue({
41
- post: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
69
+ const mockAxios = createMockAxiosInstance({
70
+ post: jasmine.createSpy('post').and.returnValue(Promise.resolve(response)),
42
71
  });
72
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
43
73
  const result = await api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams);
44
74
  expect(result).toEqual(response.data);
45
75
  });
46
76
  it('| should throw an error for unsupported HTTP method', async () => {
47
77
  callParams.type = 'unsupported';
78
+ const mockAxios = createMockAxiosInstance();
79
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
48
80
  await expectAsync(api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(jasmine.any(fsm_dynamo_1.DyFM_Error));
49
81
  });
50
82
  it('| should handle error response with DYNAMO flag', async () => {
51
83
  const errorResponse = {
52
84
  response: { data: { flag: 'DYNAMO', message: 'Error' } },
53
85
  };
54
- spyOn(axios_1.default, 'create').and.returnValue({
55
- get: jasmine.createSpy().and.returnValue(Promise.reject(errorResponse)),
86
+ const mockAxios = createMockAxiosInstance({
87
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(errorResponse)),
56
88
  });
89
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
57
90
  await expectAsync(api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(jasmine.any(fsm_dynamo_1.DyFM_Error));
58
91
  });
59
92
  it('| should handle DNS error', async () => {
60
93
  const error = { code: 'ENOTFOUND' };
61
- spyOn(axios_1.default, 'create').and.returnValue({
62
- get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
94
+ const mockAxios = createMockAxiosInstance({
95
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(error)),
63
96
  });
97
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
64
98
  await expectAsync(api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(jasmine.any(fsm_dynamo_1.DyFM_Error));
65
99
  });
66
100
  it('| should handle connection refused error', async () => {
67
101
  const error = { code: 'ECONNREFUSED' };
68
- spyOn(axios_1.default, 'create').and.returnValue({
69
- get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
102
+ const mockAxios = createMockAxiosInstance({
103
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(error)),
70
104
  });
105
+ spyOn(axios_1.default, 'create').and.returnValue(mockAxios);
71
106
  await expectAsync(api_service_1.DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(jasmine.any(fsm_dynamo_1.DyFM_Error));
72
107
  });
73
108
  });
package/build/_services/core/api.service.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service.spec.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.service.spec.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/nts-dynamo",
3
- "version": "01.11.32",
3
+ "version": "01.11.34",
4
4
  "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
5
5
  "DyBu_settings": {
6
6
  "packageType": "server-package",
@@ -164,12 +164,12 @@
164
164
  },
165
165
  "homepage": "https:/futdevpro.hu/projects/dynamo",
166
166
  "DISABLED": {
167
- "@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.11.27.tgz",
167
+ "@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.11.28.tgz",
168
168
 
169
169
  "empty": ""
170
170
  },
171
171
  "peerDependencies": {
172
- "@futdevpro/fsm-dynamo": "1.11.27",
172
+ "@futdevpro/fsm-dynamo": "1.11.28",
173
173
 
174
174
  "@types/express": "4.17.21",
175
175
  "@types/geoip-lite": "~1.4.1",
package/src/_collections/get-environment-settings.util.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { DyFM_allEnvironmentFlags, DyFM_EnvironmentFlag, DyFM_Log } from '@futdevpro/fsm-dynamo';
2
2
  import { DyNTS_Environment_Settings } from '../_models/interfaces/environment-settings.interface';
3
- import dotenv from 'dotenv';
3
+ import * as dotenv from 'dotenv';
4
4
 
5
5
  export function DyNTS_getEnvironment_settings(): DyNTS_Environment_Settings {
6
6
  dotenv.config()
package/src/_models/control-models/api-call-params.control-model.ts CHANGED
@@ -2,6 +2,17 @@
2
2
  import { DyFM_getConstructionStackLocation, DyFM_HttpCallType, DyFM_HttpResponseType, DyFM_Log, } from '@futdevpro/fsm-dynamo';
3
3
  import { DyNTS_global_settings } from '../../_collections/global-settings.const';
4
4
 
5
+
6
+ export interface DyNTS_AxiosSettings {
7
+ headers?: { [header: string]: string | string[] };
8
+ httpAgent?: any;
9
+ httpsAgent?: any;
10
+ timeout?: number;
11
+ maxRedirects?: number;
12
+ withCredentials?: boolean;
13
+ responseType?: DyFM_HttpResponseType;
14
+ }
15
+
5
16
  /**
6
17
  * API call params,
7
18
  * such as
@@ -37,7 +48,7 @@ export class DyNTS_ApiCall_Params {
37
48
  /**
38
49
  * this setting will be passed to the axios http call
39
50
  */
40
- httpOptions: any = {};
51
+ httpOptions: any | DyNTS_AxiosSettings = {};
41
52
 
42
53
  pathParamKeys: string[] = [];
43
54
 
package/src/_modules/open-ai/_services/oai-chunk.service-base.ts CHANGED
@@ -47,7 +47,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
47
47
  pageCompareResult.newChunks[i]._id = pageCompareResult.oldChunks[i]._id;
48
48
  } else {
49
49
  await this.deleteData(pageCompareResult.oldChunks[i]._id, true).catch(error => {
50
- DyFM_Error.logSimple('❌ Chunk not deleted', error);
50
+ DyFM_Error.logSimple(`❌ ${this.dataParams.dataName} Chunk not deleted`, error);
51
51
  });
52
52
  }
53
53
  }
@@ -65,7 +65,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
65
65
  chunk.path = chunk.allFlaggedParents.join('/');
66
66
 
67
67
  if (this.debugLog) {
68
- DyFM_Log.H_info(`✅ saving Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
68
+ DyFM_Log.H_info(`✅ saving ${this.dataParams.dataName} Chunk: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`, {
69
69
  chunk: chunk,
70
70
  });
71
71
 
@@ -74,12 +74,12 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
74
74
  }
75
75
 
76
76
  await this.saveData(chunk, false, true);
77
- DyFM_Log.info(`✅ Chunk saved: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`)
77
+ DyFM_Log.info(`✅ ${this.dataParams.dataName} Chunk saved: ${pageCompareResult.subjectPage.name}; ${chunk.chunkIndex}`)
78
78
  }
79
79
  }
80
80
  );
81
81
 
82
- DyFM_Log.success(`✅ Chunks updated(SAVED) for page: ${pageCompareResult.subjectPage.name}`);
82
+ DyFM_Log.success(`✅ ${this.dataParams.dataName} Chunks updated(SAVED) for page: ${pageCompareResult.subjectPage.name}`);
83
83
  } catch (error) {
84
84
  throw new DyFM_Error({
85
85
  ...this.getDefaultErrorSettings('updatePage', error),
@@ -91,18 +91,18 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
91
91
  async comparePage(page: T_Page, issuer: string): Promise<DyNTS_OAI_PageCompareResult<T_Chunk, T_Page>> {
92
92
  try {
93
93
  if (this.debugLog) {
94
- DyFM_Log.info(`🔍 Comparing page: ${page.name}`);
94
+ DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} page: ${page.name}`);
95
95
  }
96
96
 
97
97
  if (!page?.allFlaggedParentsMerged) {
98
98
  DyFM_Log.T_error(
99
- `❌ allFlaggedParentsMerged is not set (${page.name})`, JSON.stringify(page, null, 2)
99
+ `❌ ${this.dataParams.dataName} allFlaggedParentsMerged is not set (${page.name})`, JSON.stringify(page, null, 2)
100
100
  );
101
101
 
102
102
  throw new DyFM_Error({
103
103
  ...this.getDefaultErrorSettings(
104
104
  'comparePage',
105
- new Error(`allFlaggedParentsMerged is not set (${page.name})`),
105
+ new Error(`${this.dataParams.dataName} allFlaggedParentsMerged is not set (${page.name})`),
106
106
  ),
107
107
  errorCode: 'DCH-CSB-CP0',
108
108
  });
@@ -130,7 +130,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
130
130
  compareResults.every(result => result.result === DyNTS_OAI_CompareResult_Type.equal)
131
131
  ) {
132
132
  if (this.debugLog) {
133
- DyFM_Log.info(`✅ Page is equal: ${page.name}`);
133
+ DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is equal: ${page.name}`);
134
134
  }
135
135
 
136
136
  return {
@@ -147,7 +147,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
147
147
  compareResults.every(result => result.result === DyNTS_OAI_CompareResult_Type.new)
148
148
  ) {
149
149
  if (this.debugLog) {
150
- DyFM_Log.info(`✅ Page is new: ${page.name}`);
150
+ DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is new: ${page.name}`);
151
151
  }
152
152
 
153
153
  return {
@@ -161,7 +161,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
161
161
  }
162
162
 
163
163
  if (this.debugLog) {
164
- DyFM_Log.info(`✅ Page is modified: ${page.name}`);
164
+ DyFM_Log.info(`✅ ${this.dataParams.dataName} Page is modified: ${page.name}`);
165
165
  }
166
166
 
167
167
  return {
@@ -189,7 +189,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
189
189
  ): Promise<DyNTS_OAI_ChunkCompareResult<T_Chunk>[]> {
190
190
  try {
191
191
  if (this.debugLog) {
192
- DyFM_Log.info(`🔍 Comparing chunks: ${chunks.length}`);
192
+ DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} chunks: ${chunks.length}`);
193
193
  }
194
194
 
195
195
  if (chunks.length === 0) {
@@ -199,7 +199,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
199
199
  if (chunks.some(chunk => !chunk.path)) {
200
200
  throw new DyFM_Error({
201
201
  ...this.getDefaultErrorSettings(
202
- 'compareChunks', new Error('allFlaggedParentsMerged is not set'),
202
+ 'compareChunks', new Error(`${this.dataParams.dataName} allFlaggedParentsMerged is not set`),
203
203
  ),
204
204
  errorCode: 'DCH-CSB-CC0',
205
205
  });
@@ -230,7 +230,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
230
230
  ): Promise<DyNTS_OAI_ChunkCompareResult<T_Chunk>> {
231
231
  try {
232
232
  if (this.debugLog) {
233
- DyFM_Log.info(`🔍 Comparing chunk: ${newChunk.chunkIndex}`);
233
+ DyFM_Log.info(`🔍 Comparing ${this.dataParams.dataName} chunk: ${newChunk.chunkIndex}`);
234
234
  }
235
235
 
236
236
  oldChunk ??= await this.findData({
@@ -238,7 +238,7 @@ export class DyNTS_OAI_Chunk_DataServiceBase<
238
238
  chunkIndex: newChunk.chunkIndex,
239
239
  } as DyFM_DBFilterSimple<T_Chunk>);
240
240
 
241
- /* DyFM_Log.H_info(`✅ Comparing chunk: ${newChunk.chunkIndex}`, {
241
+ /* DyFM_Log.H_info(`✅ Comparing ${this.dataParams.dataName} chunk: ${newChunk.chunkIndex}`, {
242
242
  newChunk: newChunk,
243
243
  oldChunk: oldChunk,
244
244
  new: !oldChunk,
package/src/_services/core/api.service.spec.ts CHANGED
@@ -29,13 +29,43 @@ describe('| DyNTS_ApiService', () => {
29
29
  };
30
30
  });
31
31
 
32
+ // Helper function to create a complete mock Axios instance
33
+ const createMockAxiosInstance = (methods: any = {}) => {
34
+ return {
35
+ defaults: {
36
+ headers: {
37
+ common: {},
38
+ delete: {},
39
+ get: {},
40
+ head: {},
41
+ post: {},
42
+ put: {},
43
+ patch: {},
44
+ },
45
+ httpsAgent: undefined,
46
+ httpAgent: undefined,
47
+ timeout: undefined,
48
+ maxRedirects: undefined,
49
+ withCredentials: undefined,
50
+ responseType: undefined,
51
+ },
52
+ get: jasmine.createSpy('get'),
53
+ post: jasmine.createSpy('post'),
54
+ put: jasmine.createSpy('put'),
55
+ patch: jasmine.createSpy('patch'),
56
+ delete: jasmine.createSpy('delete'),
57
+ ...methods,
58
+ };
59
+ };
60
+
32
61
  it('| should make a GET request successfully', async () => {
33
62
  callParams.type = DyFM_HttpCallType.get;
34
63
  const response = { data: { success: true } };
64
+ const mockAxios = createMockAxiosInstance({
65
+ get: jasmine.createSpy('get').and.returnValue(Promise.resolve(response)),
66
+ });
35
67
 
36
- spyOn(Axios, 'create').and.returnValue({
37
- get: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
38
- } as any);
68
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
39
69
 
40
70
  const result = await DyNTS_ApiService.startApiCall(callParams, inputParams);
41
71
 
@@ -45,10 +75,11 @@ describe('| DyNTS_ApiService', () => {
45
75
  it('| should handle a POST request successfully', async () => {
46
76
  callParams.type = DyFM_HttpCallType.post;
47
77
  const response = { data: { success: true } };
78
+ const mockAxios = createMockAxiosInstance({
79
+ post: jasmine.createSpy('post').and.returnValue(Promise.resolve(response)),
80
+ });
48
81
 
49
- spyOn(Axios, 'create').and.returnValue({
50
- post: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
51
- } as any);
82
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
52
83
 
53
84
  const result = await DyNTS_ApiService.startApiCall(callParams, inputParams);
54
85
 
@@ -57,6 +88,9 @@ describe('| DyNTS_ApiService', () => {
57
88
 
58
89
  it('| should throw an error for unsupported HTTP method', async () => {
59
90
  callParams.type = 'unsupported' as DyFM_HttpCallType;
91
+ const mockAxios = createMockAxiosInstance();
92
+
93
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
60
94
 
61
95
  await expectAsync(DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(
62
96
  jasmine.any(DyFM_Error)
@@ -67,10 +101,11 @@ describe('| DyNTS_ApiService', () => {
67
101
  const errorResponse = {
68
102
  response: { data: { flag: 'DYNAMO', message: 'Error' } },
69
103
  };
104
+ const mockAxios = createMockAxiosInstance({
105
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(errorResponse)),
106
+ });
70
107
 
71
- spyOn(Axios, 'create').and.returnValue({
72
- get: jasmine.createSpy().and.returnValue(Promise.reject(errorResponse)),
73
- } as any);
108
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
74
109
 
75
110
  await expectAsync(DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(
76
111
  jasmine.any(DyFM_Error)
@@ -79,10 +114,11 @@ describe('| DyNTS_ApiService', () => {
79
114
 
80
115
  it('| should handle DNS error', async () => {
81
116
  const error = { code: 'ENOTFOUND' };
117
+ const mockAxios = createMockAxiosInstance({
118
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(error)),
119
+ });
82
120
 
83
- spyOn(Axios, 'create').and.returnValue({
84
- get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
85
- } as any);
121
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
86
122
 
87
123
  await expectAsync(DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(
88
124
  jasmine.any(DyFM_Error)
@@ -91,10 +127,11 @@ describe('| DyNTS_ApiService', () => {
91
127
 
92
128
  it('| should handle connection refused error', async () => {
93
129
  const error = { code: 'ECONNREFUSED' };
130
+ const mockAxios = createMockAxiosInstance({
131
+ get: jasmine.createSpy('get').and.returnValue(Promise.reject(error)),
132
+ });
94
133
 
95
- spyOn(Axios, 'create').and.returnValue({
96
- get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
97
- } as any);
134
+ spyOn(Axios, 'create').and.returnValue(mockAxios);
98
135
 
99
136
  await expectAsync(DyNTS_ApiService.startApiCall(callParams, inputParams)).toBeRejectedWith(
100
137
  jasmine.any(DyFM_Error)
package/src/_services/core/api.service.ts CHANGED
@@ -86,8 +86,8 @@ export class DyNTS_ApiService {
86
86
  });
87
87
  }
88
88
 
89
- if (callParams?.httpOptions?.headers) {
90
- this.setupHeaders(callParams, axios);
89
+ if (callParams?.httpOptions) {
90
+ this.setupAxiosConfig(callParams, axios);
91
91
  }
92
92
 
93
93
  if (inputParams?.pathParams) {
@@ -404,6 +404,8 @@ export class DyNTS_ApiService {
404
404
 
405
405
  if (callParams.getFullResponse) {
406
406
  return res as T_Response;
407
+ } else {
408
+ return res.data;
407
409
  }
408
410
  }
409
411
  );
@@ -458,24 +460,63 @@ export class DyNTS_ApiService {
458
460
  }
459
461
  }
460
462
 
461
- private static setupHeaders(
463
+ private static setupAxiosConfig(
462
464
  callParams: DyNTS_ApiCall_Params,
463
465
  axios: Axios.AxiosInstance
464
466
  ): void {
465
- for (const headerKey in callParams.httpOptions.headers) {
466
- if (callParams.httpOptions.headers[headerKey]) {
467
- axios.defaults.headers.common[headerKey] = callParams.httpOptions.headers[headerKey];
467
+ // Ensure axios.defaults exists
468
+ if (!axios.defaults) {
469
+ DyFM_Log.error(
470
+ `ERROR: axios.defaults is undefined in setupAxiosConfig for call (cant set headers and other options): "${callParams.name}"`,
471
+ '\n stack:', callParams.stack
472
+ );
468
473
 
469
- } else {
470
- throw new DyFM_Error({
471
- ...this._getDefaultErrorSettings(
472
- 'setupHeaders',
473
- new Error(`missing header: ${headerKey}`)
474
- ),
475
- errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SH0`,
476
- });
474
+ return;
475
+ }
476
+
477
+ // Set headers
478
+ if (callParams.httpOptions?.headers) {
479
+ axios.defaults.headers.common ??= {};
480
+
481
+ for (const headerKey in callParams.httpOptions.headers) {
482
+ if (!callParams.httpOptions.headers[headerKey]) {
483
+ throw new DyFM_Error({
484
+ ...this._getDefaultErrorSettings(
485
+ 'setupHeaders',
486
+ new Error(`missing header: ${headerKey}`)
487
+ ),
488
+ errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SH0`,
489
+ });
490
+ }
491
+
492
+ axios.defaults.headers.common[headerKey] = callParams.httpOptions.headers[headerKey];
477
493
  }
478
494
  }
495
+
496
+ // Set other Axios configuration options
497
+ if (callParams.httpOptions?.httpsAgent) {
498
+ axios.defaults.httpsAgent = callParams.httpOptions.httpsAgent;
499
+ }
500
+
501
+ if (callParams.httpOptions?.httpAgent) {
502
+ axios.defaults.httpAgent = callParams.httpOptions.httpAgent;
503
+ }
504
+
505
+ if (callParams.httpOptions?.timeout !== undefined) {
506
+ axios.defaults.timeout = callParams.httpOptions.timeout;
507
+ }
508
+
509
+ if (callParams.httpOptions?.maxRedirects !== undefined) {
510
+ axios.defaults.maxRedirects = callParams.httpOptions.maxRedirects;
511
+ }
512
+
513
+ if (callParams.httpOptions?.withCredentials !== undefined) {
514
+ axios.defaults.withCredentials = callParams.httpOptions.withCredentials;
515
+ }
516
+
517
+ if (callParams.httpOptions?.responseType !== undefined) {
518
+ axios.defaults.responseType = callParams.httpOptions.responseType;
519
+ }
479
520
  }
480
521
 
481
522
  private static setupPathParams(
package/src/_services/server/app.server.ts CHANGED
@@ -8,7 +8,7 @@ import * as BodyParser from 'body-parser';
8
8
  import * as FileSystem from 'fs';
9
9
  import * as Http from 'http';
10
10
  import * as Https from 'https';
11
- import dotenv from 'dotenv'
11
+ import * as dotenv from 'dotenv'
12
12
 
13
13
  /* import { version } from '../../../package.json'; */
14
14
 
package/test.ts ADDED
Binary file
package/test2.js ADDED
@@ -0,0 +1 @@
1
+ console.log("test");
package/test2.ts ADDED
Binary file