Skip to content

Commit 8d00504

Browse files
committed
refactor(mobile): replace wavesurfer with simple-wave-record for audio recording
1 parent acf49c7 commit 8d00504

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

gulpfile.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ const common = {
130130
'node_modules/prop-types/prop-types.min.js',
131131
'node_modules/interactjs/dist/interact.min.js',
132132
'node_modules/photoswipe/dist/umd/*.js',
133-
'node_modules/wavesurfer.js/dist/wavesurfer.min.js',
134-
'node_modules/wavesurfer.js/dist/plugins/record.min.js',
133+
'node_modules/@xyhp915/simple-wave-record/dist/simple-wave-record.umd.js',
135134
'packages/amplify/dist/amplify.js',
136135
'packages/ui/dist/ui/ui.js',
137136
'node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
"@js-joda/timezone": "2.5.0",
139139
"@logseq/diff-merge": "^0.2.2",
140140
"@logseq/react-tweet-embed": "1.3.1-1",
141+
"@xyhp915/simple-wave-record": "^0.0.2",
141142
"@radix-ui/colors": "^0.1.8",
142143
"@sentry/react": "^6.18.2",
143144
"@sentry/tracing": "^6.18.2",
@@ -192,7 +193,6 @@
192193
"threads": "1.6.5",
193194
"url": "^0.11.0",
194195
"util": "^0.12.5",
195-
"wavesurfer.js": "7.10.1",
196196
"yargs-parser": "20.2.4"
197197
},
198198
"resolutions": {

resources/mobile/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<script defer src="./js/interact.min.js"></script>
1616
<script defer src="./js/marked.min.js"></script>
1717
<script defer src="./js/eventemitter3.umd.min.js"></script>
18-
<script defer src="./js/wavesurfer.min.js"></script>
18+
<script defer src="./js/simple-wave-record.umd.js"></script>
1919
<script defer src="./js/record.min.js"></script>
2020
<script defer src="./js/photoswipe.umd.min.js"></script>
2121
<script defer src="./js/photoswipe-lightbox.umd.min.js"></script>

src/main/mobile/components/recorder.cljs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@
5555

5656
;; save local
5757
(when-let [filename (some->> ext (str "Audio-"
58-
(date/get-date-time-string (t/now)
59-
{:formatter-str audio-file-format})
58+
(date/get-date-time-string
59+
(t/now)
60+
{:formatter-str audio-file-format})
6061
"."))]
6162
(p/let [file (js/File. [blob] filename #js {:type (.-type blob)})
6263
result (editor-handler/db-based-save-assets! (state/get-current-repo)
@@ -98,7 +99,7 @@
9899
#js {:renderRecordedAudio false
99100
:scrollingWaveform true
100101
:scrollingWaveformWindow 5
101-
:mimeType "audio/mp4" ;; m4a
102+
:mimeType "audio/mp4" ;; m4a
102103
:audioBitsPerSecond 128000}))]
103104
(set-wavesurfer! w)
104105
(reset! *wavesurfer w)
@@ -117,7 +118,7 @@
117118
(catch js/Error e
118119
(js/console.warn "WARN: bad progress time:" e))))
119120
33)))
120-
;; auto start
121+
;; auto start
121122
(.startRecording r)
122123
#(some-> @*wavesurfer (.destroy))))
123124
[])
@@ -156,9 +157,9 @@
156157
[])
157158
[:div.p-6.flex.justify-between
158159
[:div.flex.justify-between.items-center.w-full
159-
;; [:span.flex.flex-col.timer-wrap
160-
;; [:strong.timer "00:00"]
161-
;; [:small "05:00"]]
160+
;; [:span.flex.flex-col.timer-wrap
161+
;; [:strong.timer "00:00"]
162+
;; [:small "05:00"]]
162163
(shui/button {:variant :outline
163164
:class "record-ctrl-btn rounded-full recording"
164165
:on-click (fn []

tailwind.mobile.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@import "codemirror/theme/solarized.css";
1616
@import "resources/css/tabler-extension.css";
1717
@import "@tabler/icons-webfont/tabler-icons.min.css";
18+
@import "@xyhp915/simple-wave-record/dist/style.css";
1819
@import "src/main/frontend/animations.css";
1920
@import "src/main/frontend/common.css";
2021
@import "src/main/frontend/ui.css";

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,6 +1672,11 @@
16721672
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
16731673
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
16741674

1675+
"@xyhp915/simple-wave-record@^0.0.2":
1676+
version "0.0.2"
1677+
resolved "https://registry.yarnpkg.com/@xyhp915/simple-wave-record/-/simple-wave-record-0.0.2.tgz#cfedf0b37f4cb7e077e2be42253894e913bb2393"
1678+
integrity sha512-KSMSTii8D+tXPyrjg/kiPjNR1LPWFGWApUVdN2QLpfiM1O3LRxM7/oGS7ZZFFiH8wXtiCS3d5dGp4s7K5KZVGg==
1679+
16751680
JSONStream@^1.0.4:
16761681
version "1.3.5"
16771682
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -10784,11 +10789,6 @@ watchpack@^2.4.1:
1078410789
glob-to-regexp "^0.4.1"
1078510790
graceful-fs "^4.1.2"
1078610791

10787-
wavesurfer.js@7.10.1:
10788-
version "7.10.1"
10789-
resolved "https://registry.yarnpkg.com/wavesurfer.js/-/wavesurfer.js-7.10.1.tgz#c2f799a05d939cbb1e5df8aa7e0485ab44ad7594"
10790-
integrity sha512-tF1ptFCAi8SAqKbM1e7705zouLC3z4ulXCg15kSP5dQ7VDV30Q3x/xFRcuVIYTT5+jB/PdkhiBRCfsMshZG1Ug==
10791-
1079210792
webidl-conversions@^3.0.0:
1079310793
version "3.0.1"
1079410794
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

0 commit comments

Comments
 (0)