@map-colonies/mc-utils 1.4.1 → 1.4.6

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/README.md CHANGED
@@ -1,67 +1,67 @@
1
- # mc-utils
2
- this is general utilities for usage in Map Colonies project.
3
-
4
- # included components
5
- - [http client](#http-client)
6
-
7
- # usage
8
- ## http client
9
- this is abstract base class for sending http request with logging and request retries.
10
-
11
- this class constructor requires the following parameters:
12
- - [ILogger](#ilogger) instance.
13
- - base url to use for all requests.
14
- - optional name for target service to be used in logs.
15
- - optional [retry configuration](#ihttpretryconfig).
16
-
17
- the class have the following protected attributes
18
- -```axiosOptions``` the options used by axios when sending requests
19
-
20
- the class have the protected methods for sending http requests:
21
- - ```protected async get<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
22
- - ```protected async post<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
23
- - ```protected async put<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
24
- - ```protected async delete<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
25
- - ```protected async head<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
26
- - ```protected async options<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
27
- - ```protected async patch<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
28
-
29
- function parameters list:
30
- - `url`: url path to send the request to (not including the base url).
31
- - `body`: optional object to be used as request body (in relevant request types).
32
- - `queryParams`: optional dictionary with query parameters and value.
33
- - `retryConfig`: optional override to the class retry configuration.
34
- - `auth`: optional basic authentication object (username, password).
35
- - `headers`: optional headers to proceed to the request.
36
-
37
- usage example:
38
- ```typescript
39
- class myServiceClient extends HttpClient {
40
- public constructor(logger: ILogger){
41
- super(logger,'https://myService.com','myService',{
42
- attempts: 3,
43
- delay: 'exponential',
44
- shouldResetTimeout: true
45
- })
46
- }
47
-
48
- public async getName(): string {
49
- const name = await this.get<string>('api/name',{queryParam1: 'name'});
50
- return name;
51
- }
52
- }
53
- ```
54
- # models
55
- ## ILogger
56
- logger interface
57
- with the flowing log methods
58
- - ``` error(message:string) ```
59
- - ```warn(message:string)```
60
- - ```info(message: string)```
61
- - ```debug(message: string)```
62
-
63
- ## IHttpRetryConfig
64
- http requests retry configuration interface with the following attributes:
65
- - ```attempts``` - the number of request to send until valid response (not 500+ status code). this value must be integer and greater then 0.
66
- - ```delay``` - the amount of time in ms to wait between attempts (for constant delay) or ```'exponential'``` for exponential backoff.
67
- - ```shouldResetTimeout``` boolean value to indicate if the request timeout should be for each request (true) or global for all attempts (false)
1
+ # mc-utils
2
+ this is general utilities for usage in Map Colonies project.
3
+
4
+ # included components
5
+ - [http client](#http-client)
6
+
7
+ # usage
8
+ ## http client
9
+ this is abstract base class for sending http request with logging and request retries.
10
+
11
+ this class constructor requires the following parameters:
12
+ - [ILogger](#ilogger) instance.
13
+ - base url to use for all requests.
14
+ - optional name for target service to be used in logs.
15
+ - optional [retry configuration](#ihttpretryconfig).
16
+
17
+ the class have the following protected attributes
18
+ -```axiosOptions``` the options used by axios when sending requests
19
+
20
+ the class have the protected methods for sending http requests:
21
+ - ```protected async get<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
22
+ - ```protected async post<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
23
+ - ```protected async put<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
24
+ - ```protected async delete<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
25
+ - ```protected async head<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
26
+ - ```protected async options<T>(url: string, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
27
+ - ```protected async patch<T>(url: string, body?: unknown, queryParams?: Record<string, unknown>, retryConfig?: IAxiosRetryConfig, auth?: AxiosBasicCredentials, headers?: unknown): Promise<T>```
28
+
29
+ function parameters list:
30
+ - `url`: url path to send the request to (not including the base url).
31
+ - `body`: optional object to be used as request body (in relevant request types).
32
+ - `queryParams`: optional dictionary with query parameters and value.
33
+ - `retryConfig`: optional override to the class retry configuration.
34
+ - `auth`: optional basic authentication object (username, password).
35
+ - `headers`: optional headers to proceed to the request.
36
+
37
+ usage example:
38
+ ```typescript
39
+ class myServiceClient extends HttpClient {
40
+ public constructor(logger: ILogger){
41
+ super(logger,'https://myService.com','myService',{
42
+ attempts: 3,
43
+ delay: 'exponential',
44
+ shouldResetTimeout: true
45
+ })
46
+ }
47
+
48
+ public async getName(): string {
49
+ const name = await this.get<string>('api/name',{queryParam1: 'name'});
50
+ return name;
51
+ }
52
+ }
53
+ ```
54
+ # models
55
+ ## ILogger
56
+ logger interface
57
+ with the flowing log methods
58
+ - ``` error(message:string) ```
59
+ - ```warn(message:string)```
60
+ - ```info(message: string)```
61
+ - ```debug(message: string)```
62
+
63
+ ## IHttpRetryConfig
64
+ http requests retry configuration interface with the following attributes:
65
+ - ```attempts``` - the number of request to send until valid response (not 500+ status code). this value must be integer and greater then 0.
66
+ - ```delay``` - the amount of time in ms to wait between attempts (for constant delay) or ```'exponential'``` for exponential backoff.
67
+ - ```shouldResetTimeout``` boolean value to indicate if the request timeout should be for each request (true) or global for all attempts (false)
@@ -247,7 +247,7 @@ var HttpClient = /** @class */ (function () {
247
247
  });
248
248
  };
249
249
  HttpClient.prototype.getRequestConfig = function (retryConfig, queryParams, auth, headers) {
250
- var reqConfig = retryConfig ? __assign(__assign({}, this.axiosOptions), { 'axios-retry': retryConfig }) : this.axiosOptions;
250
+ var reqConfig = retryConfig ? __assign(__assign({}, this.axiosOptions), { 'axios-retry': retryConfig }) : __assign({}, this.axiosOptions);
251
251
  if (queryParams !== undefined) {
252
252
  reqConfig.params = reqConfig.params !== undefined ? __assign(__assign({}, reqConfig.params), queryParams) : queryParams;
253
253
  }
@@ -1 +1 @@
1
- {"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../src/communication/http/httpClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../src/communication/http/httpClient.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ exports.bboxToTileRange = exports.bboxFromTiles = exports.snapBBoxToTileGrid = v
4
4
  var geoConvertor_1 = require("./geoConvertor");
5
5
  var tiles_1 = require("./tiles");
6
6
  var snapMinCordToTileGrid = function (cord, tileRes) {
7
- var newCord = cord - Math.abs(cord % tileRes);
7
+ var newCord = Math.floor(cord / tileRes) * tileRes;
8
8
  return newCord;
9
9
  };
10
10
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"bboxUtils.js","sourceRoot":"","sources":["../../src/geo/bboxUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bboxUtils.js","sourceRoot":"","sources":["../../src/geo/bboxUtils.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ export declare function degreesPerPixel(zoomLevel: number): number;
19
19
  */
20
20
  export declare function flipYAxis(tile: ITile): ITile;
21
21
  /**
22
- * converts pixel size (resolution) in degrees to matching zoom level (rounded up)
22
+ * converts pixel size (resolution) in degrees to matching zoom level (rounded down)
23
23
  * @param resolution pixel size (resolution) in degrees
24
24
  * @returns zoom level for given pixel size
25
25
  */
package/dist/geo/tiles.js CHANGED
@@ -38,14 +38,14 @@ function flipYAxis(tile) {
38
38
  }
39
39
  exports.flipYAxis = flipYAxis;
40
40
  /**
41
- * converts pixel size (resolution) in degrees to matching zoom level (rounded up)
41
+ * converts pixel size (resolution) in degrees to matching zoom level (rounded down)
42
42
  * @param resolution pixel size (resolution) in degrees
43
43
  * @returns zoom level for given pixel size
44
44
  */
45
45
  function degreesPerPixelToZoomLevel(resolution) {
46
46
  var MIN_ZOOM_LEVEL = 0;
47
47
  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
48
- var zoomLevel = Math.ceil(Math.log2(180 / (resolution * 256)));
48
+ var zoomLevel = Math.floor(Math.log2(180 / (resolution * 256)));
49
49
  if (zoomLevel < MIN_ZOOM_LEVEL) {
50
50
  throw new Error("Invalid zoom level ".concat(zoomLevel, " for resolution ").concat(resolution));
51
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tiles.js","sourceRoot":"","sources":["../../src/geo/tiles.ts"],"names":[],"mappings":";;;AAEA,+CAA+C;AAE/C;;;;GAIG;AACH,SAAgB,cAAc,CAAC,SAAiB;IAC9C,IAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,OAAO,QAAQ,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;AACrC,CAAC;AAHD,wCAGC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,SAAiB;IAC/C,IAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,IAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1C,OAAO,OAAO,GAAG,QAAQ,CAAC;AAC5B,CAAC;AAJD,0CAIC;AAED;;;;GAIG;AACH,SAAgB,SAAS,CAAC,IAAW;IACnC,IAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;IAC9B,OAAO;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC;QACtB,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC;AACJ,CAAC;AAPD,8BAOC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,UAAkB;IAC3D,IAAM,cAAc,GAAG,CAAC,CAAC;IACzB,+DAA+D;IAC/D,IAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,SAAS,GAAG,cAAc,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,6BAAsB,SAAS,6BAAmB,UAAU,CAAE,CAAC,CAAC;KACjF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AARD,gEAQC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAW;IACpC,IAAM,QAAQ,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;AAC9G,CAAC;AAJD,gCAIC"}
1
+ {"version":3,"file":"tiles.js","sourceRoot":"","sources":["../../src/geo/tiles.ts"],"names":[],"mappings":";;;AAEA,+CAA+C;AAE/C;;;;GAIG;AACH,SAAgB,cAAc,CAAC,SAAiB;IAC9C,IAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,OAAO,QAAQ,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;AACrC,CAAC;AAHD,wCAGC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,SAAiB;IAC/C,IAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,IAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1C,OAAO,OAAO,GAAG,QAAQ,CAAC;AAC5B,CAAC;AAJD,0CAIC;AAED;;;;GAIG;AACH,SAAgB,SAAS,CAAC,IAAW;IACnC,IAAM,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;IAC9B,OAAO;QACL,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC;QACtB,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC;AACJ,CAAC;AAPD,8BAOC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,UAAkB;IAC3D,IAAM,cAAc,GAAG,CAAC,CAAC;IACzB,+DAA+D;IAC/D,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,SAAS,GAAG,cAAc,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,6BAAsB,SAAS,6BAAmB,UAAU,CAAE,CAAC,CAAC;KACjF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AARD,gEAQC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAW;IACpC,IAAM,QAAQ,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,GAAG,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;AAC9G,CAAC;AAJD,gCAIC"}
package/package.json CHANGED
@@ -1,76 +1,76 @@
1
- {
2
- "name": "@map-colonies/mc-utils",
3
- "version": "1.4.1",
4
- "description": "This is template for map colonies typescript packages",
5
- "main": "./dist/index.js",
6
- "scripts": {
7
- "test:unit": "jest --config=./tests/configurations/unit/jest.config.js",
8
- "test:integration": "jest --config=./tests/configurations/integration/jest.config.js",
9
- "format": "prettier --check .",
10
- "format:fix": "prettier --write .",
11
- "prelint:fix": "npm run format:fix",
12
- "prelint": "npm run format",
13
- "lint": "eslint .",
14
- "lint:fix": "eslint --fix .",
15
- "release": "standard-version",
16
- "test": "npm run test:unit && npm run test:integration",
17
- "prebuild": "npm run clean",
18
- "build": "tsc --project tsconfig.build.json",
19
- "start": "npm run build && cd dist && node ./index.js",
20
- "clean": "rimraf dist",
21
- "prepack": "npm run build"
22
- },
23
- "repository": {
24
- "type": "git",
25
- "url": "git+https://github.com/MapColonies/mc-utils.git"
26
- },
27
- "author": "MapColonies",
28
- "license": "ISC",
29
- "bugs": {
30
- "url": "https://github.com/MapColonies/mc-utils/issues"
31
- },
32
- "husky": {
33
- "hooks": {
34
- "pre-commit": "pretty-quick --staged",
35
- "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
36
- }
37
- },
38
- "files": [
39
- "dist/**/*"
40
- ],
41
- "homepage": "https://github.com/MapColonies/mc-utils#readme",
42
- "devDependencies": {
43
- "@commitlint/cli": "^11.0.0",
44
- "@commitlint/config-conventional": "^11.0.0",
45
- "@map-colonies/eslint-config": "^2.2.0",
46
- "@map-colonies/prettier-config": "0.0.1",
47
- "@types/express": "^4.17.13",
48
- "@types/jest": "^26.0.19",
49
- "@types/lodash": "^4.14.171",
50
- "@types/ngeohash": "^0.6.3",
51
- "@types/node": "^14.14.12",
52
- "commitlint": "^11.0.0",
53
- "cz-conventional-changelog": "^3.3.0",
54
- "eslint": "^7.8.1",
55
- "husky": "^4.3.5",
56
- "jest": "^26.6.3",
57
- "jest-create-mock-instance": "^1.1.0",
58
- "jest-html-reporters": "^2.1.2",
59
- "prettier": "^2.2.1",
60
- "pretty-quick": "^3.1.0",
61
- "standard-version": "^9.3.0",
62
- "ts-jest": "^26.4.4",
63
- "ts-node": "^9.1.1",
64
- "typedoc": "^0.22.10",
65
- "typescript": "^4.2.4"
66
- },
67
- "dependencies": {
68
- "@map-colonies/error-types": "^1.1.0",
69
- "@turf/turf": "^6.5.0",
70
- "axios": "^0.21.1",
71
- "axios-retry": "^3.1.9",
72
- "http-status-codes": "^2.1.4",
73
- "lodash": "^4.17.21",
74
- "ngeohash": "^0.6.3"
75
- }
76
- }
1
+ {
2
+ "name": "@map-colonies/mc-utils",
3
+ "version": "1.4.6",
4
+ "description": "This is template for map colonies typescript packages",
5
+ "main": "./dist/index.js",
6
+ "scripts": {
7
+ "test:unit": "jest --config=./tests/configurations/unit/jest.config.js",
8
+ "test:integration": "jest --config=./tests/configurations/integration/jest.config.js",
9
+ "format": "prettier --check .",
10
+ "format:fix": "prettier --write .",
11
+ "prelint:fix": "npm run format:fix",
12
+ "prelint": "npm run format",
13
+ "lint": "eslint .",
14
+ "lint:fix": "eslint --fix .",
15
+ "release": "standard-version",
16
+ "test": "npm run test:unit && npm run test:integration",
17
+ "prebuild": "npm run clean",
18
+ "build": "tsc --project tsconfig.build.json",
19
+ "start": "npm run build && cd dist && node ./index.js",
20
+ "clean": "rimraf dist",
21
+ "prepack": "npm run build"
22
+ },
23
+ "repository": {
24
+ "type": "git",
25
+ "url": "git+https://github.com/MapColonies/mc-utils.git"
26
+ },
27
+ "author": "MapColonies",
28
+ "license": "ISC",
29
+ "bugs": {
30
+ "url": "https://github.com/MapColonies/mc-utils/issues"
31
+ },
32
+ "husky": {
33
+ "hooks": {
34
+ "pre-commit": "pretty-quick --staged",
35
+ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
36
+ }
37
+ },
38
+ "files": [
39
+ "dist/**/*"
40
+ ],
41
+ "homepage": "https://github.com/MapColonies/mc-utils#readme",
42
+ "devDependencies": {
43
+ "@commitlint/cli": "^11.0.0",
44
+ "@commitlint/config-conventional": "^11.0.0",
45
+ "@map-colonies/eslint-config": "^2.2.0",
46
+ "@map-colonies/prettier-config": "0.0.1",
47
+ "@types/express": "^4.17.13",
48
+ "@types/jest": "^26.0.19",
49
+ "@types/lodash": "^4.14.171",
50
+ "@types/ngeohash": "^0.6.3",
51
+ "@types/node": "^14.14.12",
52
+ "commitlint": "^11.0.0",
53
+ "cz-conventional-changelog": "^3.3.0",
54
+ "eslint": "^7.8.1",
55
+ "husky": "^4.3.5",
56
+ "jest": "^26.6.3",
57
+ "jest-create-mock-instance": "^1.1.0",
58
+ "jest-html-reporters": "^2.1.2",
59
+ "prettier": "^2.2.1",
60
+ "pretty-quick": "^3.1.0",
61
+ "standard-version": "^9.3.0",
62
+ "ts-jest": "^26.4.4",
63
+ "ts-node": "^9.1.1",
64
+ "typedoc": "^0.22.10",
65
+ "typescript": "^4.2.4"
66
+ },
67
+ "dependencies": {
68
+ "@map-colonies/error-types": "^1.1.0",
69
+ "@turf/turf": "^6.5.0",
70
+ "axios": "^0.21.1",
71
+ "axios-retry": "^3.1.9",
72
+ "http-status-codes": "^2.1.4",
73
+ "lodash": "^4.17.21",
74
+ "ngeohash": "^0.6.3"
75
+ }
76
+ }