Update dependency music-metadata to ESM version v10.3.0

2024-08-29 21:15:38 +02:00
3 changed files with 160 additions and 122 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
        "languagedetect": "2.0.0",
        "location-history": "1.1.2",
        "material-ui": "0.20.2",
-        "music-metadata": "7.14.0",
+        "music-metadata": "^10.3.0",
        "network-address": "1.1.2",
        "parse-torrent": "9.1.5",
        "prettier-bytes": "1.0.4",
@@ -1397,6 +1397,12 @@
      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
    },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
+      "license": "MIT"
+    },
    "node_modules/@sindresorhus/is": {
      "version": "0.14.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -1421,7 +1427,8 @@
    "node_modules/@tokenizer/token": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "license": "MIT"
    },
    "node_modules/@types/aria-query": {
      "version": "5.0.0",
@@ -6959,21 +6966,51 @@
      }
    },
    "node_modules/file-type": {
-      "version": "16.5.4",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
-      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "version": "19.4.1",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-19.4.1.tgz",
+      "integrity": "sha512-RuWzwF2L9tCHS76KR/Mdh+DwJZcFCzrhrPXpOw6MlEfl/o31fjpTikzcKlYuyeV7e7ftdCGVJTNOCzkYD/aLbw==",
+      "license": "MIT",
      "dependencies": {
-        "readable-web-to-node-stream": "^3.0.0",
-        "strtok3": "^6.2.4",
-        "token-types": "^4.1.1"
+        "get-stream": "^9.0.1",
+        "strtok3": "^8.1.0",
+        "token-types": "^6.0.0",
+        "uint8array-extras": "^1.3.0"
      },
      "engines": {
-        "node": ">=10"
+        "node": ">=18"
      },
      "funding": {
        "url": "https://github.com/sindresorhus/file-type?sponsor=1"
      }
    },
+    "node_modules/file-type/node_modules/get-stream": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/file-type/node_modules/is-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/filename-reserved-regex": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -10145,24 +10182,32 @@
      }
    },
    "node_modules/music-metadata": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-7.14.0.tgz",
-      "integrity": "sha512-xrm3w7SV0Wk+OythZcSbaI8mcr/KHd0knJieu8bVpaPfMv/Agz5EooCAPz3OR5hbYMiUG6dgAPKZKnMzV+3amA==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-10.3.0.tgz",
+      "integrity": "sha512-iW4D7KW0yyIQ2E7GGBG+TDJtoWRZLaZIcH0i/RiiD9V2CR1917VzSGDCDyJEZM7Mi3EH/JZuFJNAicTFjqmsDQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/Borewit"
+        },
+        {
+          "type": "buymeacoffee",
+          "url": "https://buymeacoffee.com/borewit"
+        }
+      ],
+      "license": "MIT",
      "dependencies": {
        "@tokenizer/token": "^0.3.0",
        "content-type": "^1.0.5",
        "debug": "^4.3.4",
-        "file-type": "^16.5.4",
+        "file-type": "^19.4.1",
        "media-typer": "^1.1.0",
-        "strtok3": "^6.3.0",
-        "token-types": "^4.2.1"
+        "strtok3": "^8.1.0",
+        "token-types": "^6.0.0",
+        "uint8array-extras": "^1.4.0"
      },
      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "node": ">=16.0.0"
      }
    },
    "node_modules/music-metadata/node_modules/debug": {
@@ -11001,11 +11046,12 @@
      }
    },
    "node_modules/peek-readable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
-      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.4.tgz",
+      "integrity": "sha512-E7mY2VmKqw9jYuXrSWGHFuPCW2SLQenzXLF3amGaY6lXXg4/b3gj5HVM7h8ZjCO/nZS9ICs0Cz285+32FvNd/A==",
+      "license": "MIT",
      "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
      },
      "funding": {
        "type": "github",
@@ -11877,34 +11923,6 @@
        "util-deprecate": "~1.0.1"
      }
    },
-    "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
-      "dependencies": {
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
-    },
-    "node_modules/readable-web-to-node-stream/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
    "node_modules/readable-wrap": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
@@ -13589,15 +13607,16 @@
      }
    },
    "node_modules/strtok3": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
-      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-8.1.0.tgz",
+      "integrity": "sha512-ExzDvHYPj6F6QkSNe/JxSlBxTh3OrI6wrAIz53ulxo1c4hBJ1bT9C/JrAthEKHWG9riVH3Xzg7B03Oxty6S2Lw==",
+      "license": "MIT",
      "dependencies": {
        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^4.1.0"
+        "peek-readable": "^5.1.4"
      },
      "engines": {
-        "node": ">=10"
+        "node": ">=16"
      },
      "funding": {
        "type": "github",
@@ -14002,15 +14021,16 @@
      }
    },
    "node_modules/token-types": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
-      "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.0.0.tgz",
+      "integrity": "sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA==",
+      "license": "MIT",
      "dependencies": {
        "@tokenizer/token": "^0.3.0",
        "ieee754": "^1.2.1"
      },
      "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
      },
      "funding": {
        "type": "github",
@@ -14297,6 +14317,18 @@
        "buffer-alloc": "^1.1.0"
      }
    },
+    "node_modules/uint8array-extras": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.4.0.tgz",
+      "integrity": "sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/unbox-primitive": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -16779,6 +16811,11 @@
      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
    },
+    "@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg=="
+    },
    "@sindresorhus/is": {
      "version": "0.14.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -20935,13 +20972,30 @@
      }
    },
    "file-type": {
-      "version": "16.5.4",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
-      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "version": "19.4.1",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-19.4.1.tgz",
+      "integrity": "sha512-RuWzwF2L9tCHS76KR/Mdh+DwJZcFCzrhrPXpOw6MlEfl/o31fjpTikzcKlYuyeV7e7ftdCGVJTNOCzkYD/aLbw==",
      "requires": {
-        "readable-web-to-node-stream": "^3.0.0",
-        "strtok3": "^6.2.4",
-        "token-types": "^4.1.1"
+        "get-stream": "^9.0.1",
+        "strtok3": "^8.1.0",
+        "token-types": "^6.0.0",
+        "uint8array-extras": "^1.3.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+          "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
+          "requires": {
+            "@sec-ant/readable-stream": "^0.4.1",
+            "is-stream": "^4.0.1"
+          }
+        },
+        "is-stream": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+          "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A=="
+        }
      }
    },
    "filename-reserved-regex": {
@@ -23330,17 +23384,18 @@
      }
    },
    "music-metadata": {
-      "version": "7.14.0",
-      "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-7.14.0.tgz",
-      "integrity": "sha512-xrm3w7SV0Wk+OythZcSbaI8mcr/KHd0knJieu8bVpaPfMv/Agz5EooCAPz3OR5hbYMiUG6dgAPKZKnMzV+3amA==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-10.3.0.tgz",
+      "integrity": "sha512-iW4D7KW0yyIQ2E7GGBG+TDJtoWRZLaZIcH0i/RiiD9V2CR1917VzSGDCDyJEZM7Mi3EH/JZuFJNAicTFjqmsDQ==",
      "requires": {
        "@tokenizer/token": "^0.3.0",
        "content-type": "^1.0.5",
        "debug": "^4.3.4",
-        "file-type": "^16.5.4",
+        "file-type": "^19.4.1",
        "media-typer": "^1.1.0",
-        "strtok3": "^6.3.0",
-        "token-types": "^4.2.1"
+        "strtok3": "^8.1.0",
+        "token-types": "^6.0.0",
+        "uint8array-extras": "^1.4.0"
      },
      "dependencies": {
        "debug": {
@@ -23964,9 +24019,9 @@
      }
    },
    "peek-readable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
-      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.1.4.tgz",
+      "integrity": "sha512-E7mY2VmKqw9jYuXrSWGHFuPCW2SLQenzXLF3amGaY6lXXg4/b3gj5HVM7h8ZjCO/nZS9ICs0Cz285+32FvNd/A=="
    },
    "peek-stream": {
      "version": "1.1.3",
@@ -24643,26 +24698,6 @@
        "util-deprecate": "~1.0.1"
      }
    },
-    "readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
-      "requires": {
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
    "readable-wrap": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
@@ -25869,12 +25904,12 @@
      }
    },
    "strtok3": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
-      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-8.1.0.tgz",
+      "integrity": "sha512-ExzDvHYPj6F6QkSNe/JxSlBxTh3OrI6wrAIz53ulxo1c4hBJ1bT9C/JrAthEKHWG9riVH3Xzg7B03Oxty6S2Lw==",
      "requires": {
        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^4.1.0"
+        "peek-readable": "^5.1.4"
      }
    },
    "sumchecker": {
@@ -26206,9 +26241,9 @@
      }
    },
    "token-types": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
-      "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.0.0.tgz",
+      "integrity": "sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA==",
      "requires": {
        "@tokenizer/token": "^0.3.0",
        "ieee754": "^1.2.1"
@@ -26404,6 +26439,11 @@
        "buffer-alloc": "^1.1.0"
      }
    },
+    "uint8array-extras": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.4.0.tgz",
+      "integrity": "sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ=="
+    },
    "unbox-primitive": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
    "languagedetect": "2.0.0",
    "location-history": "1.1.2",
    "material-ui": "0.20.2",
-    "music-metadata": "7.14.0",
+    "music-metadata": "^10.3.0",
    "network-address": "1.1.2",
    "parse-torrent": "9.1.5",
    "prettier-bytes": "1.0.4",
--- a/src/renderer/webtorrent.js
+++ b/src/renderer/webtorrent.js
@@ -6,7 +6,7 @@ const crypto = require('crypto')
 const util = require('util')
 const { ipcRenderer } = require('electron')
 const fs = require('fs')
-const mm = require('music-metadata')
+const { loadMusicMetadata } = require('music-metadata')
 const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
@@ -345,25 +345,23 @@ function getAudioMetadata (infoHash, index) {
      })
    }
  }
-  const onMetadata = file.done
-    // If completed; use direct file access
-    ? mm.parseFile(path.join(torrent.path, file.path), options)
-    // otherwise stream
-    : mm.parseStream(file.createReadStream(), file.name, options)

-  onMetadata
-    .then(
-      metadata => {
-        ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
-        console.log(`metadata for file='${file.name}' completed.`)
-      },
-      err => {
-        console.log(
-          `error getting audio metadata for ${infoHash}:${index}`,
-          err
-        )
-      }
+  loadMusicMetadata(mm => {
+    return file.done
+      // If completed; use direct file access
+      ? mm.parseFile(path.join(torrent.path, file.path), options)
+      // otherwise stream
+      : mm.parseStream(file.createReadStream(), file.name, options)
+  }).then(metadata => {
+    ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
+    console.log(`metadata for file='${file.name}' completed.`)
+  },
+  err => {
+    console.log(
+      `error getting audio metadata for ${infoHash}:${index}`,
+      err
    )
+  })
 }

 function selectFiles (torrentOrInfoHash, selections) {