@ogcio/building-blocks-sdk 0.1.7 → 0.1.9

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 (7) hide show
  1. package/dist/client/base-client.d.ts.map +1 -1
  2. package/dist/client/base-client.js +8 -1
  3. package/dist/client/base-client.js.map +1 -1
  4. package/dist/client/utils/client-utils.js +4 -4
  5. package/package.json +1 -1
  6. package/src/client/base-client.ts +8 -2
  7. package/src/client/utils/client-utils.ts +4 -4
package/dist/client/base-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-client.d.ts","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE7E,8BAAsB,UAAU,CAAC,CAAC,SAAS,EAAE;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAC;IAEpB,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEzC,EACV,OAAO,EACP,UAAU,EACV,MAAM,GACP,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,aAAa,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAsCM,WAAW;cAIF,QAAQ;IASjB,aAAa;CAGrB"}
1
+ {"version":3,"file":"base-client.d.ts","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE7E,8BAAsB,UAAU,CAAC,CAAC,SAAS,EAAE;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAC;IAEpB,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACrC,SAAS,CAAC,WAAW,EAAE,YAAY,GAAG,SAAS,CAAC;IAChD,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEzC,EACV,OAAO,EACP,UAAU,EACV,MAAM,GACP,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,aAAa,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IA4CM,WAAW;cAIF,QAAQ;IASjB,aAAa;CAGrB"}
package/dist/client/base-client.js CHANGED
@@ -26,7 +26,14 @@ export class BaseClient {
26
26
  }
27
27
  if (this.logger) {
28
28
  const clonedRequest = request.clone();
29
- this.logger.debug({ body: await clonedRequest.json(), url: clonedRequest.url }, `${this.serviceName} - executing request`);
29
+ let requestBody = null;
30
+ try {
31
+ requestBody = await clonedRequest.json();
32
+ }
33
+ catch (_e) {
34
+ requestBody = clonedRequest.body;
35
+ }
36
+ this.logger.trace({ body: requestBody, url: clonedRequest.url }, `${this.serviceName} - executing request`);
30
37
  }
31
38
  if (this.token) {
32
39
  request.headers.set("Authorization", `Bearer ${this.token}`);
package/dist/client/base-client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-client.js","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAG9D,MAAM,OAAgB,UAAU;IACtB,OAAO,CAAU;IACjB,WAAW,CAAC;IAEV,KAAK,CAAU;IACf,UAAU,CAAiB;IAC3B,WAAW,CAA2B;IACtC,MAAM,CAAU;IAEhB,MAAM,CAAqC;IAErD,YAAY,EACV,OAAO,EACP,UAAU,EACV,MAAM,GAKP;QACC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,MAAM,cAAc,GAAe;YACjC,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACnC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAA2B,CAAC,CAAC;gBACvE,CAAC;gBAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChB,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,EAC5D,GAAG,IAAI,CAAC,WAAW,sBAAsB,CAC1C,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,QAAQ;QACtB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAA2B,CAAC,CAAC;YACtE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF"}
1
+ {"version":3,"file":"base-client.js","sourceRoot":"","sources":["../../src/client/base-client.ts"],"names":[],"mappings":"AAAA,OAAO,YAAiC,MAAM,eAAe,CAAC;AAG9D,MAAM,OAAgB,UAAU;IACtB,OAAO,CAAU;IACjB,WAAW,CAAC;IAEV,KAAK,CAAU;IACf,UAAU,CAAiB;IAC3B,WAAW,CAA2B;IACtC,MAAM,CAAU;IAEhB,MAAM,CAAqC;IAErD,YAAY,EACV,OAAO,EACP,UAAU,EACV,MAAM,GAKP;QACC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,MAAM,cAAc,GAAe;YACjC,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACnC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAA2B,CAAC,CAAC;gBACvE,CAAC;gBAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChB,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;oBACtC,IAAI,WAAW,GAAG,IAAI,CAAC;oBACvB,IAAI,CAAC;wBACH,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAC3C,CAAC;oBAAC,OAAO,EAAE,EAAE,CAAC;wBACZ,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;oBACnC,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,EAC7C,GAAG,IAAI,CAAC,WAAW,sBAAsB,CAC1C,CAAC;gBACJ,CAAC;gBAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,QAAQ;QACtB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAA2B,CAAC,CAAC;YACtE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF"}
package/dist/client/utils/client-utils.js CHANGED
@@ -16,10 +16,10 @@ export function formatResponse(response, serviceName, logger) {
16
16
  let outputData = undefined;
17
17
  let outputMetadata = undefined;
18
18
  if (!response) {
19
- logger?.debug(`${serviceName} - Undefined response`);
19
+ logger?.trace(`${serviceName} - Undefined response`);
20
20
  return {};
21
21
  }
22
- logger?.debug({ rawResponse: response }, `${serviceName} - Raw response`);
22
+ logger?.trace({ rawResponse: response }, `${serviceName} - Raw response`);
23
23
  if (response.data) {
24
24
  const dataEntries = Object.entries(response.data);
25
25
  // by docs the body should contain a "data"
@@ -36,12 +36,12 @@ export function formatResponse(response, serviceName, logger) {
36
36
  metadata: outputMetadata,
37
37
  error: response.error,
38
38
  };
39
- logger?.debug({ formattedResponse }, `${serviceName} - Formatted response`);
39
+ logger?.trace({ formattedResponse }, `${serviceName} - Formatted response`);
40
40
  return formattedResponse;
41
41
  }
42
42
  export function formatError(reason, serviceName, logger) {
43
43
  if (logger) {
44
- logger.debug({ reason }, `${serviceName} - Got error`);
44
+ logger.trace({ reason }, `${serviceName} - Got error`);
45
45
  }
46
46
  return { error: reason };
47
47
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ogcio/building-blocks-sdk",
3
- "version": "0.1.7",
3
+ "version": "0.1.9",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "type": "module",
package/src/client/base-client.ts CHANGED
@@ -41,8 +41,14 @@ export abstract class BaseClient<T extends {}> {
41
41
 
42
42
  if (this.logger) {
43
43
  const clonedRequest = request.clone();
44
- this.logger.debug(
45
- { body: await clonedRequest.json(), url: clonedRequest.url },
44
+ let requestBody = null;
45
+ try {
46
+ requestBody = await clonedRequest.json();
47
+ } catch (_e) {
48
+ requestBody = clonedRequest.body;
49
+ }
50
+ this.logger.trace(
51
+ { body: requestBody, url: clonedRequest.url },
46
52
  `${this.serviceName} - executing request`,
47
53
  );
48
54
  }
package/src/client/utils/client-utils.ts CHANGED
@@ -60,11 +60,11 @@ export function formatResponse<G extends Record<string | number, any>, O>(
60
60
  let outputMetadata = undefined;
61
61
 
62
62
  if (!response) {
63
- logger?.debug(`${serviceName} - Undefined response`);
63
+ logger?.trace(`${serviceName} - Undefined response`);
64
64
  return {} as DataResponseValue<G, O>;
65
65
  }
66
66
 
67
- logger?.debug({ rawResponse: response }, `${serviceName} - Raw response`);
67
+ logger?.trace({ rawResponse: response }, `${serviceName} - Raw response`);
68
68
  if (response.data) {
69
69
  const dataEntries = Object.entries(response.data);
70
70
  // by docs the body should contain a "data"
@@ -84,7 +84,7 @@ export function formatResponse<G extends Record<string | number, any>, O>(
84
84
  error: response.error,
85
85
  } as unknown as DataResponseValue<G, O>;
86
86
 
87
- logger?.debug({ formattedResponse }, `${serviceName} - Formatted response`);
87
+ logger?.trace({ formattedResponse }, `${serviceName} - Formatted response`);
88
88
 
89
89
  return formattedResponse;
90
90
  }
@@ -95,7 +95,7 @@ export function formatError<G, O>(
95
95
  logger?: Logger,
96
96
  ): DataResponseValue<G, O> {
97
97
  if (logger) {
98
- logger.debug({ reason }, `${serviceName} - Got error`);
98
+ logger.trace({ reason }, `${serviceName} - Got error`);
99
99
  }
100
100
  return { error: reason } as unknown as DataResponseValue<G, O>;
101
101
  }