From abdac785a42c602103fc7af4e6ca014ee10c983c Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Wed, 23 Nov 2022 10:50:26 +0800
Subject: [PATCH] fix deprecation

---
 package.json         |  2 +-
 public/electron.js   |  3 +++
 src/capture-frame.js |  6 +++---
 yarn.lock            | 25 ++++++++-----------------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 5069b415..c1cc68b9 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "sharp": "^0.30.5",
     "smpte-timecode": "^1.2.3",
     "sortablejs": "^1.13.0",
-    "strong-data-uri": "^1.0.5",
     "sweetalert2": "^11.0.0",
     "sweetalert2-react-content": "^4.0.0",
     "use-debounce": "^5.1.0",
@@ -96,6 +95,7 @@
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "cue-parser": "^0.3.0",
+    "data-uri-to-buffer": "^4.0.0",
     "electron-is-dev": "^2.0.0",
     "electron-store": "5.1.1",
     "electron-unhandled": "^4.0.1",
diff --git a/public/electron.js b/public/electron.js
index a80d0e0f..f09e5f50 100644
--- a/public/electron.js
+++ b/public/electron.js
@@ -1,3 +1,6 @@
+process.traceDeprecation = true;
+process.traceProcessWarnings = true;
+
 const electron = require('electron'); // eslint-disable-line
 const isDev = require('electron-is-dev');
 const unhandled = require('electron-unhandled');
diff --git a/src/capture-frame.js b/src/capture-frame.js
index e8f44084..adcb088c 100644
--- a/src/capture-frame.js
+++ b/src/capture-frame.js
@@ -1,4 +1,4 @@
-import strongDataUri from 'strong-data-uri';
+import dataUriToBuffer from 'data-uri-to-buffer';
 
 import { getSuffixedOutPath, transferTimestamps } from './util';
 import { formatDuration } from './util/duration';
@@ -17,7 +17,7 @@ function getFrameFromVideo(video, format) {
 
   const dataUri = canvas.toDataURL(`image/${format}`);
 
-  return strongDataUri.decode(dataUri);
+  return dataUriToBuffer(dataUri);
 }
 
 export async function captureFramesFfmpeg({ customOutDir, filePath, fromTime, captureFormat, enableTransferTimestamps, numFrames }) {
@@ -39,7 +39,7 @@ export async function captureFramesFfmpeg({ customOutDir, filePath, fromTime, ca
 export async function captureFrameFromTag({ customOutDir, filePath, currentTime, captureFormat, video, enableTransferTimestamps }) {
   const buf = getFrameFromVideo(video, captureFormat);
 
-  const ext = mime.extension(buf.mimetype);
+  const ext = mime.extension(buf.type);
   const time = formatDuration({ seconds: currentTime, fileNameFriendly: true });
 
   const outPath = getSuffixedOutPath({ customOutDir, filePath, nameSuffix: `${time}.${ext}` });
diff --git a/yarn.lock b/yarn.lock
index 244056bf..5047c1fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5791,6 +5791,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-uri-to-buffer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "data-uri-to-buffer@npm:4.0.0"
+  checksum: a010653869abe8bb51259432894ac62c52bf79ad761d418d94396f48c346f2ae739c46b254e8bb5987bded8a653d467db1968db3a69bab1d33aa5567baa5cfc7
+  languageName: node
+  linkType: hard
+
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -10661,6 +10668,7 @@ __metadata:
     csv-parse: ^4.15.3
     csv-stringify: ^5.6.2
     cue-parser: ^0.3.0
+    data-uri-to-buffer: ^4.0.0
     electron: ^21.3.0
     electron-builder: ^23.3.3
     electron-builder-notarize: ^1.4.0
@@ -10713,7 +10721,6 @@ __metadata:
     smpte-timecode: ^1.2.3
     sortablejs: ^1.13.0
     string-to-stream: ^1.1.1
-    strong-data-uri: ^1.0.5
     strtok3: ^6.0.0
     sweetalert2: ^11.0.0
     sweetalert2-react-content: ^4.0.0
@@ -15199,15 +15206,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strong-data-uri@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "strong-data-uri@npm:1.0.6"
-  dependencies:
-    truncate: ^2.0.1
-  checksum: 36f20fc80be9ad216924afa4b8228891b043f9b88b27fd4b29a86b430731cd041122c2b35d14630ad56438ed404622f84b24fb23c54f51e2f3bf3fd399c58972
-  languageName: node
-  linkType: hard
-
 "strtok3@npm:^6.0.0":
   version: 6.2.4
   resolution: "strtok3@npm:6.2.4"
@@ -15844,13 +15842,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"truncate@npm:^2.0.1":
-  version: 2.1.0
-  resolution: "truncate@npm:2.1.0"
-  checksum: a2f1a0fcccf20009ba143a2873925f002e7c5d5390889d285873f2325daa3974216eae4f04244868633c9c41f571059fbad7c20988fbd130fbcf66592ac8c83c
-  languageName: node
-  linkType: hard
-
 "tryer@npm:^1.0.1":
   version: 1.0.1
   resolution: "tryer@npm:1.0.1"