zigbee-herdsman-converters 20.44.0 → 21.0.0-pre.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "20.44.0",
+  "version": "21.0.0-pre.1",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "types": "index.d.ts",
@@ -33,14 +33,10 @@
   },
   "homepage": "https://github.com/Koenkk/zigbee-herdsman-converters",
   "dependencies": {
-    "axios": "^1.7.7",
     "buffer-crc32": "^1.0.0",
-    "https-proxy-agent": "^7.0.5",
     "iconv-lite": "^0.6.3",
     "semver": "^7.6.3",
-    "tar-stream": "^3.1.7",
-    "uri-js": "^4.4.1",
-    "zigbee-herdsman": "^2.1.7"
+    "zigbee-herdsman": "^3.0.0-pre.1"
   },
   "devDependencies": {
     "@eslint/core": "^0.8.0",
@@ -51,7 +47,6 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
     "@types/semver": "^7.5.8",
-    "@types/tar-stream": "^3.1.3",
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "fast-deep-equal": "^3.1.3",
@@ -67,17 +62,36 @@
   "jest": {
     "preset": "ts-jest",
     "testEnvironment": "node",
+    "clearMocks": true,
+    "collectCoverage": false,
+    "coverageProvider": "babel",
+    "coverageDirectory": "coverage",
+    "cacheDirectory": ".jest-tmp",
+    "collectCoverageFrom": [
+      "src/lib/ota.ts"
+    ],
     "roots": [
       "test/",
       "src/"
+    ],
+    "moduleFileExtensions": [
+      "ts",
+      "json",
+      "js",
+      "mjs",
+      "cjs",
+      "jsx",
+      "tsx",
+      "node"
     ]
   },
   "scripts": {
     "eslint": "eslint --max-warnings=0",
     "pretty:write": "prettier --write .",
     "pretty:check": "prettier --check .",
-    "test": "jest test --silent --maxWorkers=50%",
-    "test-watch": "jest test --silent --watch --maxWorkers=25%",
+    "test": "jest test --silent --runInBand",
+    "test:coverage": "jest test --silent --coverage --runInBand",
+    "test-watch": "jest test --silent --watch --runInBand",
     "clean": "rimraf --glob index* devices lib converters tsconfig.tsbuildinfo",
     "build": "tsc",
     "build-watch": "tsc --watch"

package/lib/ota/common.d.ts

@@ -1,31 +0,0 @@
-import { KeyValueAny, Ota, OtaUpdateAvailableResult, Zh } from '../types';
-type IsNewImageAvailable = (current: Ota.ImageInfo, device: Zh.Device, getImageMeta: Ota.GetImageMeta) => Promise<{
-    available: number;
-    currentFileVersion: number;
-    otaFileVersion: number;
-}>;
-type DownloadImage = (meta: Ota.ImageMeta) => Promise<{
-    data: Buffer;
-}>;
-type GetNewImage = (current: Ota.Version, device: Zh.Device, getImageMeta: Ota.GetImageMeta, downloadImage: DownloadImage, suppressElementImageParseFailure: boolean) => Promise<Ota.Image>;
-export declare const UPGRADE_FILE_IDENTIFIER: Buffer;
-export declare function getAxios(caBundle?: string[]): import("axios").AxiosInstance;
-export declare function setDataDir(dir: string): void;
-export declare function isValidUrl(url: string): boolean;
-export declare function readLocalFile(fileName: string): Buffer;
-export declare function getFirmwareFile(image: KeyValueAny): Promise<{
-    data: Buffer;
-}>;
-export declare function processCustomCaBundle(uri: string): Promise<string[]>;
-export declare function getOverrideIndexFile(urlOrName: string): Promise<any>;
-export declare function parseImage(buffer: Buffer, suppressElementImageParseFailure?: boolean): Ota.Image;
-export declare function validateImageData(image: Ota.Image): void;
-export declare function isUpdateAvailable(device: Zh.Device, requestPayload: Ota.ImageInfo, isNewImageAvailable?: IsNewImageAvailable, getImageMeta?: Ota.GetImageMeta): Promise<OtaUpdateAvailableResult>;
-export declare function isNewImageAvailable(current: Ota.ImageInfo, device: Zh.Device, getImageMeta: Ota.GetImageMeta): ReturnType<IsNewImageAvailable>;
-/**
- * @see https://zigbeealliance.org/wp-content/uploads/2021/10/07-5123-08-Zigbee-Cluster-Library.pdf 11.12
- */
-export declare function updateToLatest(device: Zh.Device, onProgress: Ota.OnProgress, getNewImage: GetNewImage, getImageMeta?: Ota.GetImageMeta, downloadImage?: DownloadImage, suppressElementImageParseFailure?: boolean): Promise<number>;
-export declare function getNewImage(current: Ota.ImageInfo, device: Zh.Device, getImageMeta: Ota.GetImageMeta, downloadImage: DownloadImage, suppressElementImageParseFailure: boolean): Promise<Ota.Image>;
-export {};
-//# sourceMappingURL=common.d.ts.map

package/lib/ota/common.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/lib/ota/common.ts"],"names":[],"mappings":"AAeA,OAAO,EAAW,WAAW,EAAE,GAAG,EAAE,wBAAwB,EAAE,EAAE,EAAC,MAAM,UAAU,CAAC;AAYlF,KAAK,mBAAmB,GAAG,CACvB,OAAO,EAAE,GAAG,CAAC,SAAS,EACtB,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,YAAY,KAC7B,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC;AACtF,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,KAAK,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC;AACtE,KAAK,WAAW,GAAG,CACf,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,YAAY,EAC9B,aAAa,EAAE,aAAa,EAC5B,gCAAgC,EAAE,OAAO,KACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAiBxB,eAAO,MAAM,uBAAuB,QAAwC,CAAC;AAe7E,wBAAgB,QAAQ,CAAC,QAAQ,GAAE,MAAM,EAAS,iCAqDjD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE5C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAQ/C;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQtD;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC,CAWjF;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,qBAoCtD;AAED,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,gBAY3D;AAiBD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,gCAAgC,GAAE,OAAe,GAAG,GAAG,CAAC,KAAK,CA4DvG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,IAAI,CAcxD;AAuLD,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,cAAc,EAAE,GAAG,CAAC,SAAS,EAC7B,mBAAmB,GAAE,mBAA0B,EAC/C,YAAY,GAAE,GAAG,CAAC,YAAmB,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA0BnC;AAED,wBAAsB,mBAAmB,CACrC,OAAO,EAAE,GAAG,CAAC,SAAS,EACtB,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,YAAY,GAC/B,UAAU,CAAC,mBAAmB,CAAC,CA0BjC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAChC,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,UAAU,EAAE,GAAG,CAAC,UAAU,EAC1B,WAAW,EAAE,WAAW,EACxB,YAAY,GAAE,GAAG,CAAC,YAAmB,EACrC,aAAa,GAAE,aAAoB,EACnC,gCAAgC,GAAE,OAAe,GAClD,OAAO,CAAC,MAAM,CAAC,CA4LjB;AAED,wBAAsB,WAAW,CAC7B,OAAO,EAAE,GAAG,CAAC,SAAS,EACtB,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,YAAY,EAC9B,aAAa,EAAE,aAAa,EAC5B,gCAAgC,EAAE,OAAO,GAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CA0CpB"}