Skip to content

Commit

Permalink
Cleanup: rm console.logs from hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
@rtshkmr
rtshkmr committed Aug 10, 2024
1 parent dbe5b94 commit 8460446
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 138 deletions.
45 changes: 7 additions & 38 deletions assets/js/hooks/audio_player.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ import {
playbackMetaBridge,
} from "./mediaEventBridges";

let rand = (min, max) => Math.floor(Math.random() * (max - min) + min);
let isVisible = (el) =>
!!(el.offsetWidth || el.offsetHeight || el.getClientRects().length > 0);

let execJS = (selector, attr) => {
document
.querySelectorAll(selector)
Expand All @@ -36,7 +32,6 @@ AudioPlayer = {
this.isFollowMode = false;
this.playbackBeganAt = null;
this.player = this.el.querySelector("audio");
console.log("MOUNT PING");

this.player.addEventListener("canplaythrough", (e) =>
this.handlePlayableState(e),
Expand Down Expand Up @@ -65,19 +60,13 @@ AudioPlayer = {
* as a result.
* */
handlePlaybackMetaUpdate(playback) {
console.log("TRACE: handle playback meta update:", playback);
const { meta: playbackMeta } = playback;
const { file_path: filePath } = playbackMeta;
this.loadAudio(filePath);
this.initMediaSession(playback);
},
/// Handlers for events received via the events bridge:
handleMediaPlayPause(payload) {
console.log(
"TRACE [playPauseBridge::audio_player::playpause] payload:",
payload,
);
console.log("[playPauseBridge::audio_player::playpause] payload:", payload);
const { cmd, playback } = payload;

if (cmd === "play") {
Expand All @@ -88,10 +77,6 @@ AudioPlayer = {
}
},
handleExternalSeekTime(payload) {
console.log(
"[audio_player::seekTimeBridgeSub::seekTimeHandler] payload:",
payload,
);
const { seekToMs: timeMs } = payload;
this.seekToMs(timeMs);
},
Expand All @@ -116,39 +101,31 @@ AudioPlayer = {
if (shouldIgnoreSignal) {
return;
}

console.log("[heartbeatBridge::audio_player] payload:", heartbeatPayload);
const echoPayload = {
originator: "AudioPlayer",
currentPlaybackInfo: this.readCurrentPlaybackInfo(),
};
heartbeatBridge.pub(echoPayload);
},
handlePlayableState(e) {
console.log("TRACE HandlePlayableState", e);
// this.initMediaSession(playback);
// TODO: consider if a handler is needed for the "canplaythrough" event
console.log(
"TRACE HandlePlayableState -- the audio can be played through completely now.",
e,
);
},
handlePlayPause() {
console.log("{play_pause event triggerred} player:", this.player);
if (this.player.paused) {
this.play();
}
},
playMedia(playback) {
console.log("PlayMedia", playback);

const { meta: playbackMeta, "playing?": isPlaying, elapsed } = playback;
const { title, duration, file_path: filePath, artists } = playbackMeta;
const artist = artists ? artists.join(", ") : "Unknown artist";

// TODO: supply necessary info for media sessions api here...
const { file_path: filePath } = playbackMeta;
this.updateMediaSession(playback);

const beginTime = nowMs() - elapsed;
this.playbackBeganAt = beginTime;
console.log("TRACE @playMedia", {
player: this.player,
});
let currentSrc = this.getCurrentSrc();
const isLoadedAndPaused =
currentSrc === filePath && !isPlaying && this.player.paused;
Expand Down Expand Up @@ -177,11 +154,6 @@ AudioPlayer = {
return src;
},
play(opts = {}) {
console.log("TRACE Triggered playback, check params", {
player: this.player,
opts,
});

let { sync } = opts;

this.player.play().then(
Expand All @@ -200,7 +172,6 @@ AudioPlayer = {
},
);
},
// TODO: add triggers for updateMediaSession()
pause() {
this.player.pause();
},
Expand Down Expand Up @@ -244,8 +215,7 @@ AudioPlayer = {
session.setActionHandler(e, (e) => this.dispatchPlayPauseToServer(e)),
);
},
dispatchPlayPauseToServer(e) {
console.log("TRACE Action handler invoked. Type: ", e);
dispatchPlayPauseToServer(_e) {
this.pushEvent("play_pause");
},
updateMediaSession(playback) {
Expand All @@ -254,7 +224,6 @@ AudioPlayer = {
return;
}
const payload = this.createMediaMetadataPayload(playback);
console.log("new metadata payload", { playback, payload });
navigator.mediaSession.metadata = new MediaMetadata(payload);
},
createMediaMetadataPayload(playback) {
Expand Down
42 changes: 1 addition & 41 deletions assets/js/hooks/media_bridge.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,12 @@ MediaBridge = {
* Saves current session id
* */
initSession(sess) {
console.log("TRACE initSession", sess);
localStorage.setItem("session", JSON.stringify(sess));
},
toggleFollowMode() {
this.isFollowMode = !this.isFollowMode;
},
handleHeartbeat(payload) {
console.log("[MediaBridge::handleHeartbeat]", payload);
const shouldIgnoreSignal = payload.originator === "MediaBridge";
if (shouldIgnoreSignal) {
return;
Expand All @@ -74,10 +72,6 @@ MediaBridge = {
payload.originator === "AudioPlayer",
"MediaBridge only expects heartbeat acks to come from AudioPlayer",
);
console.log(">>> progress update, payload:", {
payload,
eventsTimeline: this.eventsTimeline,
});
const { currentTimeMs, durationMs } = payload.currentPlaybackInfo || {};

this.updateTimeDisplay(currentTimeMs, durationMs);
Expand Down Expand Up @@ -111,7 +105,6 @@ MediaBridge = {
},
emphasizeActiveEvent(currentTimeMs, events) {
if (!events) {
console.log("No events found");
return;
}

Expand All @@ -122,7 +115,6 @@ MediaBridge = {
);

if (!activeEvent) {
console.log("No active event found @ time = ", currentTime);
return;
}

Expand Down Expand Up @@ -156,38 +148,28 @@ MediaBridge = {
},
startHeartbeat() {
const heartbeatInterval = 100; // 10fps, comfortable for human eye
console.log("Starting heartbeat!");
const heartbeatPayload = {
originator: "MediaBridge",
};
const heartbeatTimer = setInterval(
() => heartbeatBridge.pub(heartbeatPayload),
heartbeatInterval,
);
console.log("Started Heartbeat with:", {
heartbeatTimer,
heartbeatPayload,
heartbeatInterval,
});

this.heartbeatTimer = heartbeatTimer;
},
killHeartbeat() {
console.log("Killing heartbeat!", { heartbeatTimer: this.heartbeatTimer });
clearInterval(this.heartbeatTimer);
},
updateTimeDisplay(timeMs, durationMs = null) {
const currentTimeDisplay = formatDisplayTime(timeMs);
this.currentTime.innerText = currentTimeDisplay;
console.log("Updated time display to", currentTimeDisplay);

if (durationMs) {
const durationDisplay = formatDisplayTime(durationMs);
this.duration.innerText = durationDisplay;
}
},
seekToMs(originator, timeMs) {
console.log("media_bridge.js::seekToMs", { timeMs, originator });
const knownOriginators = ["ProgressBar", "MediaBridge"]; // temp-list, will be removed
if (!knownOriginators.includes(originator)) {
console.warn(
Expand All @@ -208,7 +190,6 @@ MediaBridge = {
}
},
registerEventsTimeline(params) {
console.log("Register Events Timeline", params);
const { voice_events } = params;
this.eventsTimeline = voice_events;
},
Expand All @@ -219,7 +200,6 @@ MediaBridge = {
* */
registerPlaybackInfo(params) {
const { playback } = params;
console.log("TRACE: registerPlaybackInfo", params);
playbackMetaBridge.pub(playback);
},
/**
Expand All @@ -232,20 +212,11 @@ MediaBridge = {
"This event may only originate from the MediaBridge server.",
);

console.log(
"TRACE media_bridge:receivePlayPauseFromServer",
playPausePayload,
);
this.updateHeartbeatFromPlayPause(playPausePayload);
playPauseBridge.pub(playPausePayload);
},
handlePlayPause(payload) {
// TODO: implement handler for actions emitted via interaction with youtube player
console.log(
"TRACE EXT[playPauseBridge::media_bridge:playpause] payload:",
payload,
);
const { cmd, playback, originator } = payload;
const { originator } = payload;

const shouldIgnoreSignal = originator === "MediaBridge";
if (shouldIgnoreSignal) {
Expand All @@ -261,13 +232,7 @@ MediaBridge = {
* NOTE: This doesn't guard for the originator of the command.
* */
updateHeartbeatFromPlayPause(payload) {
console.log("[playPauseBridge::media_bridge:playpause] payload:", payload);
const { cmd } = payload;
// TODO: implement handler for actions emitted via interaction with youtube player
console.log(
">> [media_bridge.js::playPauseBridge], received a signal",
payload,
);
if (cmd === "play") {
this.startHeartbeat();
}
Expand All @@ -281,14 +246,9 @@ MediaBridge = {
originator === "MediaBridge",
"This event may only originate from the MediaBridge server.",
);
console.log("media_bridge:seekTime event handler", seekTimePayload);
seekTimeBridge.pub(seekTimePayload);
},
handleSeekTime(payload) {
console.log(
"[media_bridge::seekTimeBridgeSub::seekTimeHandler] payload",
payload,
);
const { seekToMs: timeMs, originator } = payload;
this.seekToMs(originator, timeMs);
},
Expand Down
27 changes: 0 additions & 27 deletions assets/js/hooks/progress_bar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,10 @@ ProgressBar = {
};
},
handleExternalSeekTime(payload) {
console.log("[progress_bar::seekTimeBridgeSub::seekTimeHandler] this:", {
payload,
});
const { seekToMs: timeMs, originator } = payload;

const shouldIgnoreSignal = originator === "ProgressBar";
if (shouldIgnoreSignal) {
console.info("Ignoring signal for seekTime", payload);

return;
}

Expand All @@ -46,14 +41,9 @@ ProgressBar = {

const playbackPercentage = timeMs / maxTime;
const progressStyleWidth = `${playbackPercentage * 100}%`;
console.log("[DEBUG]", {
maxTime,
playbackPercentage,
});
this.setProgressBarWidth(progressStyleWidth);
},
handleHeartbeat(payload) {
console.log("[ProgressBar::handleHeartbeat]", payload);
const shouldIgnoreSignal = payload.originator === "MediaBridge";
if (shouldIgnoreSignal) {
return;
Expand All @@ -62,10 +52,6 @@ ProgressBar = {

const playbackPercentage = currentTimeMs / durationMs;
const progressStyleWidth = `${playbackPercentage * 100}%`;
console.log("handleHeartbeat, set progress bar width", {
progressStyleWidth,
payload,
});
this.setProgressBarWidth(progressStyleWidth);
},
/*
Expand Down Expand Up @@ -94,7 +80,6 @@ ProgressBar = {
const { max: maxTime } = this.el.dataset;

if (!maxTime) {
console.log("unable to seek position, payload is incorrect");
return;
}

Expand All @@ -113,17 +98,6 @@ ProgressBar = {
// Optimistic update
this.el.value = positionMs;

console.log("seek attempt @ positionMs:", {
checkThis: this,
elem: this.el,
event: e,
maxOffset,
currXOffset,
playbackPercentage,
maxPlaybackMs,
positionMs,
});

// pubs & dispatches this position
const seekTimePayload = {
seekToMs: positionMs,
Expand All @@ -133,7 +107,6 @@ ProgressBar = {
return;
},
setProgressBarWidth(progressStyleWidth, selector = "#player-progress") {
console.log("setting progress bar width:", progressStyleWidth);
const progressBarNode = document.querySelector(selector);
console.assert(
!!progressBarNode,
Expand Down
10 changes: 0 additions & 10 deletions assets/js/hooks/share_quote.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ ShareQuoteButton = {
} else if ("clipboard" in navigator) {
// copies to clipboard:
callback = () => {
console.log(">> see me:", { "floating ui:": window });
const {
chapter_number: chapterNum,
verse_number: verseNum,
Expand Down Expand Up @@ -76,20 +75,11 @@ import { computePosition, flip, shift, offset } from "floating-ui.dom.umd.min";

const alignTooltip = () => {
const { button, tooltip } = getButtonAndTooltip();
console.log(">>> found?", {
button,
tooltip,
});

computePosition(button, tooltip, {
placement: "right",
// NOTE: order of middleware matters.
middleware: [offset(6), flip(), shift({ padding: 16 })],
}).then(({ x, y }) => {
console.log(">>> computed new position!", {
x,
y,
});
Object.assign(tooltip.style, {
left: `${x}px`,
top: `${y}px`,
Expand Down
Loading

0 comments on commit 8460446

Please sign in to comment.