-
-
+ return (
+
+ )
}
-export default VideoEditor
\ No newline at end of file
+export default VideoEditor
diff --git a/packages/app/src/components/MusicStudio/ReleaseEditor/index.jsx b/packages/app/src/components/MusicStudio/ReleaseEditor/index.jsx
index 2e5d604c..1aa38e05 100644
--- a/packages/app/src/components/MusicStudio/ReleaseEditor/index.jsx
+++ b/packages/app/src/components/MusicStudio/ReleaseEditor/index.jsx
@@ -1,280 +1,332 @@
import React from "react"
import * as antd from "antd"
-
import { Icons, createIconRender } from "@components/Icons"
import MusicModel from "@models/music"
-
+import compareObjectsByProperties from "@utils/compareObjectsByProperties"
import useUrlQueryActiveKey from "@hooks/useUrlQueryActiveKey"
import TrackManifest from "@cores/player/classes/TrackManifest"
-import { DefaultReleaseEditorState, ReleaseEditorStateContext } from "@contexts/MusicReleaseEditor"
+import {
+ DefaultReleaseEditorState,
+ ReleaseEditorStateContext,
+} from "@contexts/MusicReleaseEditor"
import Tabs from "./tabs"
import "./index.less"
const ReleaseEditor = (props) => {
- const { release_id } = props
+ const { release_id } = props
- const basicInfoRef = React.useRef()
+ const basicInfoRef = React.useRef()
- const [submitting, setSubmitting] = React.useState(false)
- const [loading, setLoading] = React.useState(true)
- const [submitError, setSubmitError] = React.useState(null)
+ const [submitting, setSubmitting] = React.useState(false)
+ const [loading, setLoading] = React.useState(true)
+ const [submitError, setSubmitError] = React.useState(null)
- const [loadError, setLoadError] = React.useState(null)
- const [globalState, setGlobalState] = React.useState(DefaultReleaseEditorState)
+ const [loadError, setLoadError] = React.useState(null)
+ const [globalState, setGlobalState] = React.useState(
+ DefaultReleaseEditorState,
+ )
+ const [initialValues, setInitialValues] = React.useState({})
- const [customPage, setCustomPage] = React.useState(null)
- const [customPageActions, setCustomPageActions] = React.useState([])
+ const [customPage, setCustomPage] = React.useState(null)
+ const [customPageActions, setCustomPageActions] = React.useState([])
- const [selectedTab, setSelectedTab] = useUrlQueryActiveKey({
- defaultKey: "info",
- queryKey: "tab"
- })
+ const [selectedTab, setSelectedTab] = useUrlQueryActiveKey({
+ defaultKey: "info",
+ queryKey: "tab",
+ })
- async function initialize() {
- setLoading(true)
- setLoadError(null)
+ async function initialize() {
+ setLoading(true)
+ setLoadError(null)
- if (release_id !== "new") {
- try {
- let releaseData = await MusicModel.getReleaseData(release_id)
+ if (release_id !== "new") {
+ try {
+ let releaseData = await MusicModel.getReleaseData(release_id)
- if (Array.isArray(releaseData.list)) {
- releaseData.list = releaseData.list.map((item) => {
- return new TrackManifest(item)
- })
- }
+ if (Array.isArray(releaseData.items)) {
+ releaseData.items = releaseData.items.map((item) => {
+ return new TrackManifest(item)
+ })
+ }
- setGlobalState({
- ...globalState,
- ...releaseData,
- })
- } catch (error) {
- setLoadError(error)
- }
- }
+ setGlobalState({
+ ...globalState,
+ ...releaseData,
+ })
- setLoading(false)
- }
+ setInitialValues(releaseData)
+ } catch (error) {
+ setLoadError(error)
+ }
+ }
- async function renderCustomPage(page, actions) {
- setCustomPage(page ?? null)
- setCustomPageActions(actions ?? [])
- }
+ setLoading(false)
+ }
- async function handleSubmit() {
- setSubmitting(true)
- setSubmitError(null)
+ function hasChanges() {
+ const stagedChanges = {
+ title: globalState.title,
+ type: globalState.type,
+ public: globalState.public,
+ cover: globalState.cover,
+ items: globalState.items,
+ }
- try {
- // first sumbit tracks
- const tracks = await MusicModel.putTrack({
- list: globalState.list,
- })
+ return !compareObjectsByProperties(
+ stagedChanges,
+ initialValues,
+ Object.keys(stagedChanges),
+ )
+ }
- // then submit release
- const result = await MusicModel.putRelease({
- _id: globalState._id,
- title: globalState.title,
- description: globalState.description,
- public: globalState.public,
- cover: globalState.cover,
- explicit: globalState.explicit,
- type: globalState.type,
- list: tracks.list.map((item) => item._id),
- })
+ async function renderCustomPage(page, actions) {
+ setCustomPage(page ?? null)
+ setCustomPageActions(actions ?? [])
+ }
- app.location.push(`/studio/music/${result._id}`)
- } catch (error) {
- console.error(error)
- app.message.error(error.message)
+ async function handleSubmit() {
+ setSubmitting(true)
+ setSubmitError(null)
- setSubmitError(error)
- setSubmitting(false)
+ try {
+ console.log("Submitting Tracks")
- return false
- }
+ // first sumbit tracks
+ const tracks = await MusicModel.putTrack({
+ items: globalState.items,
+ })
- setSubmitting(false)
- app.message.success("Release saved")
- }
+ console.log("Submitting release")
- async function handleDelete() {
- app.layout.modal.confirm({
- headerText: "Are you sure you want to delete this release?",
- descriptionText: "This action cannot be undone.",
- onConfirm: async () => {
- await MusicModel.deleteRelease(globalState._id)
- app.location.push(window.location.pathname.split("/").slice(0, -1).join("/"))
- },
- })
- }
+ // then submit release
+ const result = await MusicModel.putRelease({
+ _id: globalState._id,
+ title: globalState.title,
+ description: globalState.description,
+ public: globalState.public,
+ cover: globalState.cover,
+ explicit: globalState.explicit,
+ type: globalState.type,
+ items: tracks.items.map((item) => item._id),
+ })
- async function canFinish() {
- return true
- }
+ app.location.push(`/studio/music/${result._id}`)
+ } catch (error) {
+ console.error(error)
+ app.message.error(error.message)
- React.useEffect(() => {
- initialize()
- }, [])
+ setSubmitError(error)
+ setSubmitting(false)
- if (loadError) {
- return
-
+ return (
+
+
+
- {
- (!props.videoSourceURL) &&
+
+
- {
- (!props.videoSourceURL) &&
-
- }
+ {props.videoSourceURL && (
+
+
+ )}
-
-
-
-
- {
+ handleChange("startSyncAt", str)
+ }}
+ />
+
+
+
-
+
+
+ {props.startSyncAt ?? "not set"}
- {props.startSyncAt ?? "not set"}
+
- Set to:
+
+
+ Set to:
- {
- handleChange("startSyncAt", str)
- }}
- />
-
-
- {
- handleChange("videoSourceURL", response.url)
- }}
- accept={[
- "video/*",
- ]}
- headers={{
- "transmux": "mq-hls",
- }}
- disabled={props.loading}
- >
- Upload video
-
-
- or
-
- {
- handleChange("videoSourceURL", e.target.value)
- }}
- value={props.videoSourceURL}
- disabled={props.loading}
- />
-
-
+ {
+ handleChange("videoSourceURL", response.url)
+ }}
+ accept={["video/*"]}
+ headers={{
+ transformations: "mq-hls",
+ }}
+ disabled={props.loading}
+ >
+ Upload video
+
+ or
+ {
+ handleChange("videoSourceURL", e.target.value)
+ }}
+ value={props.videoSourceURL}
+ disabled={props.loading}
+ />
+
+
- {
- customPage &&
+
- {
- customPage.header &&
- }
- {
- !customPage && <>
-
- {
- if (typeof action.onClick === "function") {
- await action.onClick()
- }
+ if (loading) {
+ return
- })
- }
-
- }
+ const Tab = Tabs.find(({ key }) => key === selectedTab)
- {
- customPage.content && (React.isValidElement(customPage.content) ?
- React.cloneElement(customPage.content, {
- ...CustomPageProps,
- ...customPage.props
- }) :
- React.createElement(customPage.content, {
- ...CustomPageProps,
- ...customPage.props
- })
- )
- }
-
-
+ if (loadError) {
+ return (
+ {customPage.header}
-
- setSelectedTab(e.key)}
- selectedKeys={[selectedTab]}
- items={Tabs}
- mode="vertical"
- />
+ const CustomPageProps = {
+ close: () => {
+ renderCustomPage(null, null)
+ },
+ }
-
+
+
-
+
-
+
+ {customPage && (
+ {
+ if (
+ typeof action.onClick ===
+ "function"
+ ) {
+ await action.onClick()
+ }
-
+ )}
+ {!customPage && (
+ <>
+
+ {customPage.header && (
+
+ {Array.isArray(customPageActions) &&
+ customPageActions.map((action, index) => {
+ return (
+
+
-
+
- {
- release_id !== "new" ? {customPage.header}
+
- {
- submitError &&
+ )}
- state: globalState,
- setState: setGlobalState,
+ {customPage.content &&
+ (React.isValidElement(customPage.content)
+ ? React.cloneElement(customPage.content, {
+ ...CustomPageProps,
+ ...customPage.props,
+ })
+ : React.createElement(customPage.content, {
+ ...CustomPageProps,
+ ...customPage.props,
+ }))}
+
+ setSelectedTab(e.key)}
+ selectedKeys={[selectedTab]}
+ items={Tabs}
+ mode="vertical"
+ />
- references: {
- basic: basicInfoRef
- }
- })
- }
-
-
- }
-
+
+
+ {submitError && (
+
+
+ )}
+ {
@@ -58,7 +70,7 @@ const TrackListItem = (props) => {
{props.index + 1}
- {props.uploading.working &&
@@ -280,7 +294,7 @@ class TracksManager extends React.Component {
accept="audio/*"
multiple
>
- {this.state.list.length === 0 ? (
+ {this.state.items.length === 0 ? (
- {this.state.list.length === 0 && (
+ {this.state.items.length === 0 && (
@@ -336,7 +345,7 @@ const ReleaseTracks = (props) => {
-
+ )
}
-export default TrackEditor
\ No newline at end of file
+export default TrackEditor
diff --git a/packages/app/src/components/Player/ExtraActions/index.jsx b/packages/app/src/components/Player/Actions/index.jsx
similarity index 51%
rename from packages/app/src/components/Player/ExtraActions/index.jsx
rename to packages/app/src/components/Player/Actions/index.jsx
index b3be128b..9b873395 100755
--- a/packages/app/src/components/Player/ExtraActions/index.jsx
+++ b/packages/app/src/components/Player/Actions/index.jsx
@@ -6,41 +6,51 @@ import LikeButton from "@components/LikeButton"
import { usePlayerStateContext } from "@contexts/WithPlayerContext"
+import "./index.less"
+
const ExtraActions = (props) => {
- const [playerState] = usePlayerStateContext()
+ const [trackInstance, setTrackInstance] = React.useState({})
+
+ const onPlayerStateChange = React.useCallback((state) => {
+ const instance = app.cores.player.track()
+
+ if (instance) {
+ setTrackInstance(instance)
+ }
+ }, [])
+
+ const [playerState] = usePlayerStateContext(onPlayerStateChange)
const handleClickLike = async () => {
- if (!playerState.track_manifest) {
+ if (!trackInstance) {
console.error("Cannot like a track if nothing is playing")
return false
}
- const track = app.cores.player.track()
-
- await track.manifest.serviceOperations.toggleItemFavourite(
+ await trackInstance.manifest.serviceOperations.toggleItemFavourite(
"track",
- playerState.track_manifest._id,
+ trackInstance.manifest._id,
)
}
return (
-
- handleChange("cover", url)}
- extraActions={[
-
- Use Parent
-
- ]}
- />
-
+ React.useEffect(() => {
+ context.setCustomPageActions([
+ {
+ label: "Save",
+ icon: "FiSave",
+ type: "primary",
+ onClick: handleOnSave,
+ disabled: props.track === track,
+ },
+ ])
+ }, [track])
-
-
+ function setParentCover() {
+ handleChange("cover", context.cover)
+ }
-
-
+
-
+ return (
+
+ handleChange("cover", url)}
+ extraActions={[
+
+ Use Parent
+ ,
+ ]}
+ />
+
-
+ handleChange("title", e.target.value)}
- />
-
+
+
-
- handleChange("title", e.target.value)}
+ />
+
-
-
+
+ handleChange("artist", e.target.value)}
- />
-
+
+
-
- handleChange("artist", e.target.value)}
+ />
+
-
-
+
+ handleChange("album", e.target.value)}
- />
-
+
+
-
- handleChange("album", e.target.value)}
+ />
+
-
-
+
+ handleChange("explicit", value)}
- />
-
+
+
-
-
+
- handleChange("explicit", value)}
+ />
+
-
+ handleChange("lyrics_enabled", value)}
- disabled={!track.params._id}
- />
-
+
+
-
-
- Edit
-
+
-
+
-
+
- {
- !track.params._id &&
- You cannot edit Video and Lyrics without release first
-
- }
-
+
+ Edit
+
+
+ {!track.params._id && (
+
+ You cannot edit Video and Lyrics without release
+ first
+
+ )}
+
+
+
@@ -218,7 +217,7 @@ const Player = (props) => {
streamMode={playerState.live}
/>
-
{app.isMobile && (
}
- disabled={!playerState.track_manifest?.lyrics_enabled}
+ disabled={!trackInstance?.manifest?.lyrics_enabled}
/>
)}
{!app.isMobile && (
handleAction("like")}
+ disabled={!trackInstance?.manifest?._id}
/>
)}
diff --git a/packages/app/src/components/Player/ToolBarPlayer/index.jsx b/packages/app/src/components/Player/ToolBarPlayer/index.jsx
index fac61db7..14f671ac 100755
--- a/packages/app/src/components/Player/ToolBarPlayer/index.jsx
+++ b/packages/app/src/components/Player/ToolBarPlayer/index.jsx
@@ -8,11 +8,10 @@ import { usePlayerStateContext } from "@contexts/WithPlayerContext"
import LiveInfo from "@components/Player/LiveInfo"
import SeekBar from "@components/Player/SeekBar"
import Controls from "@components/Player/Controls"
+import Actions from "@components/Player/Actions"
import RGBStringToValues from "@utils/rgbToValues"
-import ExtraActions from "../ExtraActions"
-
import "./index.less"
function isOverflown(parent, element) {
@@ -93,7 +92,7 @@ const Player = (props) => {
}
}
- const { title, artistStr, service, cover_analysis, cover } =
+ const { title, artist, service, cover_analysis, cover } =
playerState.track_manifest ?? {}
const playing = playerState.playback_status === "playing"
@@ -201,7 +200,7 @@ const Player = (props) => {
)}
- {artistStr ?? ""} + {artist ?? ""}
- {
- !progess && (props.icon ??
+
-}
\ No newline at end of file
+ {props.children ?? "Upload"}
+
+
+ {!progress &&
+ (props.icon ?? (
+
-
-
- }
- default: {
- return null
- }
- }
+ switch (props.service) {
+ case "tidal": {
+ return (
+
+
+ )
+ }
+ default: {
+ return null
+ }
+ }
}
const AudioPlayer = (props) => {
- const [playerState] = usePlayerStateContext()
+ const [playerState] = usePlayerStateContext()
- React.useEffect(() => {
- if (app.currentDragger) {
- app.currentDragger.setBackgroundColorValues(RGBStringToValues(playerState.track_manifest?.cover_analysis?.rgb))
- }
+ React.useEffect(() => {
+ if (app.currentDragger) {
+ app.currentDragger.setBackgroundColorValues(
+ RGBStringToValues(
+ playerState.track_manifest?.cover_analysis?.rgb,
+ ),
+ )
+ }
+ }, [playerState.track_manifest?.cover_analysis])
- }, [playerState.track_manifest?.cover_analysis])
+ const {
+ title,
+ album,
+ artist,
+ service,
+ lyricsEnabled,
+ cover_analysis,
+ cover,
+ } = playerState.track_manifest ?? {}
- const {
- title,
- album,
- artist,
- service,
- lyricsEnabled,
- cover_analysis,
- cover,
- } = playerState.track_manifest ?? {}
+ const playing = playerState.playback_status === "playing"
+ const stopped = playerState.playback_status === "stopped"
- const playing = playerState.playback_status === "playing"
- const stopped = playerState.playback_status === "stopped"
+ const titleText = !playing && stopped ? "Stopped" : (title ?? "Untitled")
+ const subtitleText = `${artist} | ${album?.title ?? album}`
- const titleText = (!playing && stopped) ? "Stopped" : (title ?? "Untitled")
- const subtitleText = `${artist} | ${album?.title ?? album}`
+ return (
+
+
+ )
}
-export default AudioPlayer
\ No newline at end of file
+export default AudioPlayer
diff --git a/packages/app/src/pages/@mobile-views/player/index.less b/packages/app/src/pages/@mobile-views/player/index.less
index 40cf24cc..880817ce 100755
--- a/packages/app/src/pages/@mobile-views/player/index.less
+++ b/packages/app/src/pages/@mobile-views/player/index.less
@@ -1,199 +1,184 @@
@top_controls_height: 55px;
-.mobile_media_player_wrapper {
- position: relative;
+.mobile-player_wrapper {
+ position: relative;
- z-index: 320;
+ z-index: 320;
- display: flex;
+ display: flex;
- flex-direction: column;
+ flex-direction: column;
- height: 100%;
- width: 100%;
+ height: 100%;
+ width: 100%;
- .mobile_media_player_background {
- position: absolute;
+ margin-bottom: 30px;
- z-index: 320;
+ .mobile-player_background {
+ position: absolute;
- top: 0;
- left: 0;
+ z-index: 320;
- width: 100%;
- height: 100%;
+ top: 0;
+ left: 0;
- background-color: rgba(var(--cover_averageValues), 0.4);
- }
+ width: 100%;
+ height: 100%;
+
+ background-color: rgba(var(--cover_averageValues), 0.4);
+ }
}
-.mobile_media_player {
- position: relative;
+.mobile-player {
+ position: relative;
- display: inline-flex;
- flex-direction: column;
+ display: inline-flex;
+ flex-direction: column;
- align-items: flex-start;
- justify-content: center;
+ align-items: flex-start;
+ justify-content: center;
- width: 100%;
- height: 100%;
+ width: 100%;
+ height: 100%;
- gap: 10px;
+ gap: 10px;
- transition: all 150ms ease-out;
+ transition: all 150ms ease-out;
- z-index: 330;
+ z-index: 330;
- .service_indicator {
- color: var(--text-color);
+ .service_indicator {
+ color: var(--text-color);
- background-color: var(--background-color-accent);
- padding: 7px;
- border-radius: 8px;
+ background-color: var(--background-color-accent);
+ padding: 7px;
+ border-radius: 8px;
- font-size: 0.9rem;
- }
+ font-size: 0.9rem;
+ }
- .cover {
- position: relative;
+ .mobile-player-cover {
+ position: relative;
- z-index: 320;
+ z-index: 320;
- margin: auto;
+ margin: auto;
- width: 100%;
- height: 100%;
+ width: 100%;
+ height: 100%;
- min-height: 40vh;
- min-width: 100%;
+ min-height: 40vh;
+ min-width: 100%;
- border-radius: 24px;
+ border-radius: 24px;
- background-position: center;
- background-size: cover;
- background-repeat: no-repeat;
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
- transition: all 0.3s ease-in-out;
+ transition: all 0.3s ease-in-out;
- img {
- width: 100%;
- height: 100%;
+ img {
+ width: 100%;
+ height: 100%;
- object-fit: cover;
- object-position: center;
- }
- }
+ object-fit: cover;
+ object-position: center;
+ }
+ }
- .header {
- position: relative;
+ .mobile-player-header {
+ position: relative;
- display: flex;
- flex-direction: row;
+ display: flex;
+ flex-direction: row;
- width: 100%;
+ width: 100%;
- .info {
- display: flex;
- flex-direction: column;
+ .mobile-player-info {
+ display: flex;
+ flex-direction: column;
- h1,
- h2,
- h3,
- h4,
- h5,
- h6,
- p,
- span {
- margin: 0;
- color: var(--text-color);
- }
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6,
+ p,
+ span {
+ margin: 0;
+ color: var(--text-color);
+ }
- width: 100%;
+ width: 100%;
- .title {
- font-size: 1rem;
- font-weight: 600;
- color: var(--text-color);
+ .mobile-player-info-title {
+ display: flex;
+ flex-direction: row;
- word-break: break-all;
+ align-items: center;
- font-family: "Space Grotesk", sans-serif;
- }
+ font-size: 1rem;
+ font-weight: 600;
- .subTitle {
- display: flex;
- flex-direction: row;
+ word-break: break-all;
- width: 100%;
+ font-family: "Space Grotesk", sans-serif;
+ }
- justify-content: space-between;
+ .mobile-player-info-subTitle {
+ display: flex;
+ flex-direction: row;
- .likeButton {
- margin-right: 20px;
- }
+ align-items: center;
+ justify-content: space-between;
- .artist {
- font-size: 0.6rem;
- font-weight: 400;
- color: var(--text-color);
- }
- }
- }
- }
+ font-size: 0.7rem;
+ font-weight: 400;
+ }
+ }
+ }
- .player-controls {
- .ant-btn {
- min-width: 40px !important;
- min-height: 40px !important;
- }
+ .player-controls {
+ .ant-btn {
+ min-width: 40px !important;
+ min-height: 40px !important;
+ }
- svg {
- font-size: 1.2rem;
- }
+ svg {
+ font-size: 1.2rem;
+ }
- .playButton {
- min-width: 50px !important;
- min-height: 50px !important;
+ .playButton {
+ min-width: 50px !important;
+ min-height: 50px !important;
- svg {
- font-size: 1.6rem;
- }
- }
- }
+ svg {
+ font-size: 1.6rem;
+ }
+ }
+ }
- .player-seek_bar {
- .progress {
- .MuiSlider-root {
- .MuiSlider-rail {
- height: 7px;
- }
+ .player-seek_bar {
+ .progress {
+ .MuiSlider-root {
+ .MuiSlider-rail {
+ height: 7px;
+ }
- .MuiSlider-track {
- height: 7px;
- }
+ .MuiSlider-track {
+ height: 7px;
+ }
- .MuiSlider-thumb {
- width: 5px;
- height: 13px;
- border-radius: 2px;
+ .MuiSlider-thumb {
+ width: 5px;
+ height: 13px;
+ border-radius: 2px;
- background-color: var(--background-color-contrast);
- }
- }
- }
- }
-
- .extra_actions {
- padding: 0 30px;
-
- .ant-btn {
- padding: 5px;
-
- svg {
- height: 23px;
- min-width: 23px;
- }
- }
- }
-}
\ No newline at end of file
+ background-color: var(--background-color-contrast);
+ }
+ }
+ }
+ }
+}
diff --git a/packages/app/src/pages/_debug/audiometadata/index.jsx b/packages/app/src/pages/_debug/audiometadata/index.jsx
new file mode 100644
index 00000000..c9aea4c8
--- /dev/null
+++ b/packages/app/src/pages/_debug/audiometadata/index.jsx
@@ -0,0 +1,47 @@
+import TrackManifest from "@cores/player/classes/TrackManifest"
+
+const D_Manifest = () => {
+ const [manifest, setManifest] = React.useState(null)
+
+ function selectLocalFile() {
+ const input = document.createElement("input")
+ input.type = "file"
+ input.accept = "audio/*"
+ input.onchange = (e) => {
+ loadManifest(e.target.files[0])
+ }
+ input.click()
+ }
+
+ async function loadManifest(file) {
+ let track = new TrackManifest({ file: file })
+
+ await track.initialize()
+
+ console.log(track)
+
+ setManifest(track)
+ }
+
+ return (
+
+
+
-
+
-
-
+
-
+
+
+
+ {titleText}
+
+ {subtitleText}
+
+
-
+
-
-
-
- - { - titleText - } -
-
-
-
-
- - {subtitleText} -
-
+ 
+ )}
+
+
+ )
+}
+
+export default D_Manifest
diff --git a/packages/app/src/pages/lyrics/components/controller/index.jsx b/packages/app/src/pages/lyrics/components/controller/index.jsx
index 94265cf3..116c287d 100644
--- a/packages/app/src/pages/lyrics/components/controller/index.jsx
+++ b/packages/app/src/pages/lyrics/components/controller/index.jsx
@@ -177,7 +177,7 @@ const PlayerController = React.forwardRef((props, ref) => {
)}
Select a local file to view & create a track manifest
+ + + + {manifest?.cover && ( +
+ {JSON.stringify(manifest)}
+
+
- {playerState.track_manifest?.metadata.lossless && (
+ {playerState.track_manifest?.metadata?.lossless && (
{
- const [playerState] = usePlayerStateContext()
+ const [playerState] = usePlayerStateContext()
- const { lyrics } = props
+ const { lyrics } = props
- const [initialLoading, setInitialLoading] = React.useState(true)
- const [syncInterval, setSyncInterval] = React.useState(null)
- const [syncingVideo, setSyncingVideo] = React.useState(false)
- const [currentVideoLatency, setCurrentVideoLatency] = React.useState(0)
- const hls = React.useRef(new HLS())
+ const [initialLoading, setInitialLoading] = React.useState(true)
+ const [syncInterval, setSyncInterval] = React.useState(null)
+ const [syncingVideo, setSyncingVideo] = React.useState(false)
+ const [currentVideoLatency, setCurrentVideoLatency] = React.useState(0)
+ const hls = React.useRef(new HLS())
- async function seekVideoToSyncAudio() {
- if (!lyrics) {
- return null
- }
+ async function seekVideoToSyncAudio() {
+ if (!lyrics) {
+ return null
+ }
- if (!lyrics.video_source || typeof lyrics.sync_audio_at_ms === "undefined") {
- return null
- }
+ if (
+ !lyrics.video_source ||
+ typeof lyrics.sync_audio_at_ms === "undefined"
+ ) {
+ return null
+ }
- const currentTrackTime = app.cores.player.controls.seek()
+ const currentTrackTime = app.cores.player.controls.seek()
- setSyncingVideo(true)
+ setSyncingVideo(true)
- let newTime = currentTrackTime + (lyrics.sync_audio_at_ms / 1000) + app.cores.player.gradualFadeMs / 1000
+ let newTime =
+ currentTrackTime + lyrics.sync_audio_at_ms / 1000 + 150 / 1000
- // dec some ms to ensure the video seeks correctly
- newTime -= 5 / 1000
+ // dec some ms to ensure the video seeks correctly
+ newTime -= 5 / 1000
- videoRef.current.currentTime = newTime
- }
+ videoRef.current.currentTime = newTime
+ }
- async function syncPlayback() {
- // if something is wrong, stop syncing
- if (videoRef.current === null || !lyrics || !lyrics.video_source || typeof lyrics.sync_audio_at_ms === "undefined" || playerState.playback_status !== "playing") {
- return stopSyncInterval()
- }
+ async function syncPlayback() {
+ // if something is wrong, stop syncing
+ if (
+ videoRef.current === null ||
+ !lyrics ||
+ !lyrics.video_source ||
+ typeof lyrics.sync_audio_at_ms === "undefined" ||
+ playerState.playback_status !== "playing"
+ ) {
+ return stopSyncInterval()
+ }
- const currentTrackTime = app.cores.player.controls.seek()
- const currentVideoTime = videoRef.current.currentTime - (lyrics.sync_audio_at_ms / 1000)
+ const currentTrackTime = app.cores.player.controls.seek()
+ const currentVideoTime =
+ videoRef.current.currentTime - lyrics.sync_audio_at_ms / 1000
- //console.log(`Current track time: ${currentTrackTime}, current video time: ${currentVideoTime}`)
+ //console.log(`Current track time: ${currentTrackTime}, current video time: ${currentVideoTime}`)
- const maxOffset = maxLatencyInMs / 1000
- const currentVideoTimeDiff = Math.abs(currentVideoTime - currentTrackTime)
+ const maxOffset = maxLatencyInMs / 1000
+ const currentVideoTimeDiff = Math.abs(
+ currentVideoTime - currentTrackTime,
+ )
- setCurrentVideoLatency(currentVideoTimeDiff)
+ setCurrentVideoLatency(currentVideoTimeDiff)
- if (syncingVideo === true) {
- return false
- }
+ if (syncingVideo === true) {
+ return false
+ }
- if (currentVideoTimeDiff > maxOffset) {
- seekVideoToSyncAudio()
- }
- }
+ if (currentVideoTimeDiff > maxOffset) {
+ seekVideoToSyncAudio()
+ }
+ }
- function startSyncInterval() {
- setSyncInterval(setInterval(syncPlayback, 300))
- }
+ function startSyncInterval() {
+ setSyncInterval(setInterval(syncPlayback, 300))
+ }
- function stopSyncInterval() {
- setSyncingVideo(false)
- setSyncInterval(null)
- clearInterval(syncInterval)
- }
+ function stopSyncInterval() {
+ setSyncingVideo(false)
+ setSyncInterval(null)
+ clearInterval(syncInterval)
+ }
- //* handle when player is loading
- React.useEffect(() => {
- if (lyrics?.video_source && playerState.loading === true && playerState.playback_status === "playing") {
- videoRef.current.pause()
- }
+ //* handle when player is loading
+ React.useEffect(() => {
+ if (
+ lyrics?.video_source &&
+ playerState.loading === true &&
+ playerState.playback_status === "playing"
+ ) {
+ videoRef.current.pause()
+ }
- if (lyrics?.video_source && playerState.loading === false && playerState.playback_status === "playing") {
- videoRef.current.play()
- }
- }, [playerState.loading])
+ if (
+ lyrics?.video_source &&
+ playerState.loading === false &&
+ playerState.playback_status === "playing"
+ ) {
+ videoRef.current.play()
+ }
+ }, [playerState.loading])
- //* Handle when playback status change
- React.useEffect(() => {
- if (initialLoading === false) {
- console.log(`VIDEO:: Playback status changed to ${playerState.playback_status}`)
+ //* Handle when playback status change
+ React.useEffect(() => {
+ if (initialLoading === false) {
+ console.log(
+ `VIDEO:: Playback status changed to ${playerState.playback_status}`,
+ )
- if (lyrics && lyrics.video_source) {
- if (playerState.playback_status === "playing") {
- videoRef.current.play()
- startSyncInterval()
- } else {
- videoRef.current.pause()
- stopSyncInterval()
- }
- }
- }
- }, [playerState.playback_status])
+ if (lyrics && lyrics.video_source) {
+ if (playerState.playback_status === "playing") {
+ videoRef.current.play()
+ startSyncInterval()
+ } else {
+ videoRef.current.pause()
+ stopSyncInterval()
+ }
+ }
+ }
+ }, [playerState.playback_status])
- //* Handle when lyrics object change
- React.useEffect(() => {
- setCurrentVideoLatency(0)
- stopSyncInterval()
+ //* Handle when lyrics object change
+ React.useEffect(() => {
+ setCurrentVideoLatency(0)
+ stopSyncInterval()
- if (lyrics) {
- if (lyrics.video_source) {
- console.log("Loading video source >", lyrics.video_source)
+ if (lyrics) {
+ if (lyrics.video_source) {
+ console.log("Loading video source >", lyrics.video_source)
- if (lyrics.video_source.endsWith(".mp4")) {
- videoRef.current.src = lyrics.video_source
- } else {
- hls.current.loadSource(lyrics.video_source)
- }
+ if (lyrics.video_source.endsWith(".mp4")) {
+ videoRef.current.src = lyrics.video_source
+ } else {
+ hls.current.loadSource(lyrics.video_source)
+ }
- if (typeof lyrics.sync_audio_at_ms !== "undefined") {
- videoRef.current.loop = false
- videoRef.current.currentTime = lyrics.sync_audio_at_ms / 1000
+ if (typeof lyrics.sync_audio_at_ms !== "undefined") {
+ videoRef.current.loop = false
+ videoRef.current.currentTime =
+ lyrics.sync_audio_at_ms / 1000
- startSyncInterval()
- } else {
- videoRef.current.loop = true
- videoRef.current.currentTime = 0
- }
+ startSyncInterval()
+ } else {
+ videoRef.current.loop = true
+ videoRef.current.currentTime = 0
+ }
- if (playerState.playback_status === "playing") {
- videoRef.current.play()
- }
- }
- }
+ if (playerState.playback_status === "playing") {
+ videoRef.current.play()
+ }
+ }
+ }
- setInitialLoading(false)
- }, [lyrics])
+ setInitialLoading(false)
+ }, [lyrics])
- React.useEffect(() => {
- videoRef.current.addEventListener("seeked", (event) => {
- setSyncingVideo(false)
- })
+ React.useEffect(() => {
+ videoRef.current.addEventListener("seeked", (event) => {
+ setSyncingVideo(false)
+ })
- hls.current.attachMedia(videoRef.current)
+ hls.current.attachMedia(videoRef.current)
- return () => {
- stopSyncInterval()
- }
- }, [])
+ return () => {
+ stopSyncInterval()
+ }
+ }, [])
- return <>
- {
- props.lyrics?.sync_audio_at &&
+ useCompression?: boolean
+ s3Provider?: string
+ onProgress?: Function
+}
+
+export type S3UploadPayload = {
+ filePath: string
+ basePath: string
+ targetPath?: string
+ s3Provider?: string
+ onProgress?: Function
+}
+
+export default class Upload {
+ static fileHandle = async (payload: FileHandlePayload) => {
+ if (!payload.transformations) {
+ payload.transformations = []
+ }
+
+ // if compression is enabled and no transformations are provided, add basic transformations for images or videos
+ if (
+ payload.useCompression === true &&
+ payload.transformations.length === 0
+ ) {
+ payload.transformations.push("optimize")
+ }
+
+ // process file upload if transformations are provided
+ if (payload.transformations.length > 0) {
+ // process
+ const processed = await Upload.transform(payload)
+
+ // overwrite filePath
+ payload.filePath = processed.filePath
+ }
+
+ // upload
+ const result = await Upload.toS3({
+ filePath: payload.filePath,
+ targetPath: payload.targetPath,
+ basePath: payload.user_id,
+ onProgress: payload.onProgress,
+ s3Provider: payload.s3Provider,
+ })
+
+ // delete workpath
+ await fs.promises.rm(payload.workPath, { recursive: true, force: true })
+
+ return result
+ }
+
+ static transform = async (payload: FileHandlePayload) => {
+ if (Array.isArray(payload.transformations)) {
+ for await (const transformation of payload.transformations) {
+ const transformationResult = await Transformation.transform({
+ filePath: payload.filePath,
+ workPath: payload.workPath,
+ onProgress: payload.onProgress,
+ handler: transformation,
+ })
+
+ // if is a file, overwrite filePath
+ if (transformationResult.outputFile) {
+ payload.filePath = transformationResult.outputFile
+ }
+
+ // if is a directory, overwrite filePath to upload entire directory
+ if (transformationResult.outputPath) {
+ payload.filePath = transformationResult.outputPath
+ payload.targetPath = transformationResult.outputFile
+ //payload.isDirectory = true
+ }
+ }
+ }
+
+ return payload
+ }
+
+ static toS3 = async (payload: S3UploadPayload) => {
+ const { filePath, basePath, targetPath, s3Provider, onProgress } =
+ payload
+
+ // if targetPath is provided, means its a directory
+ const isDirectory = !!targetPath
+
+ const metadata = await this.buildFileMetadata(
+ isDirectory ? targetPath : filePath,
+ )
+
+ let uploadPath = path.join(basePath, metadata["File-Hash"])
+
+ if (isDirectory) {
+ uploadPath = path.join(basePath, global.nanoid())
+ }
+
+ if (typeof onProgress === "function") {
+ onProgress({
+ percent: 0,
+ state: "uploading_s3",
+ })
+ }
+
+ // console.log("Uploading to S3:", {
+ // filePath: filePath,
+ // basePath: basePath,
+ // uploadPath: uploadPath,
+ // targetPath: targetPath,
+ // metadata: metadata,
+ // s3Provider: s3Provider,
+ // })
+
+ const result = await putObject({
+ filePath: filePath,
+ uploadPath: uploadPath,
+ metadata: metadata,
+ targetFilename: isDirectory ? path.basename(targetPath) : null,
+ provider: s3Provider,
+ })
+
+ return result
+ }
+
+ static async buildFileMetadata(filePath: string) {
+ const firstBuffer = await readChunk(filePath, {
+ length: 4100,
+ })
+ const fileHash = await getFileHash(fs.createReadStream(filePath))
+ const fileType = await fileTypeFromBuffer(firstBuffer)
+
+ const metadata = {
+ "File-Hash": fileHash,
+ "Content-Type": fileType?.mime ?? "application/octet-stream",
+ }
+
+ return metadata
+ }
+}
diff --git a/packages/server/classes/Upload/putObject.js b/packages/server/classes/Upload/putObject.js
new file mode 100644
index 00000000..91c81f74
--- /dev/null
+++ b/packages/server/classes/Upload/putObject.js
@@ -0,0 +1,65 @@
+import fs from "node:fs"
+import path from "node:path"
+import pMap from "p-map"
+
+export default async function putObject({
+ filePath,
+ uploadPath,
+ metadata = {},
+ targetFilename,
+ onFinish,
+ provider = "standard",
+}) {
+ const providerClass = global.storages[provider]
+
+ if (!providerClass) {
+ throw new Error(`Provider [${provider}] not found`)
+ }
+
+ const isDirectory = await fs.promises
+ .lstat(filePath)
+ .then((stats) => stats.isDirectory())
+
+ if (isDirectory) {
+ let files = await fs.promises.readdir(filePath)
+
+ files = files.map((file) => {
+ const newPath = path.join(filePath, file)
+
+ return {
+ filePath: newPath,
+ uploadPath: path.join(uploadPath, file),
+ }
+ })
+
+ await pMap(files, putObject, {
+ concurrency: 3,
+ })
+
+ return {
+ id: uploadPath,
+ url: providerClass.composeRemoteURL(uploadPath, targetFilename),
+ metadata: metadata,
+ }
+ }
+
+ // upload to storage
+ await providerClass.fPutObject(
+ process.env.S3_BUCKET,
+ uploadPath,
+ filePath,
+ metadata,
+ )
+
+ const result = {
+ id: uploadPath,
+ url: providerClass.composeRemoteURL(uploadPath),
+ metadata: metadata,
+ }
+
+ if (typeof onFinish === "function") {
+ await onFinish(result)
+ }
+
+ return result
+}
diff --git a/packages/server/db_models/musicRelease/index.js b/packages/server/db_models/musicRelease/index.js
index 1182879f..0a5585f6 100755
--- a/packages/server/db_models/musicRelease/index.js
+++ b/packages/server/db_models/musicRelease/index.js
@@ -1,35 +1,36 @@
export default {
- name: "MusicRelease",
- collection: "music_releases",
- schema: {
- user_id: {
- type: String,
- required: true
- },
- title: {
- type: String,
- required: true
- },
- type: {
- type: String,
- required: true,
- },
- list: {
- type: Object,
- default: [],
- required: true
- },
- cover: {
- type: String,
- default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
- },
- created_at: {
- type: Date,
- required: true
- },
- public: {
- type: Boolean,
- default: true,
- },
- }
-}
\ No newline at end of file
+ name: "MusicRelease",
+ collection: "music_releases",
+ schema: {
+ user_id: {
+ type: String,
+ required: true,
+ },
+ title: {
+ type: String,
+ required: true,
+ },
+ type: {
+ type: String,
+ required: true,
+ },
+ items: {
+ type: Array,
+ default: [],
+ required: true,
+ },
+ cover: {
+ type: String,
+ default:
+ "https://storage.ragestudio.net/comty-static-assets/default_song.png",
+ },
+ created_at: {
+ type: Date,
+ required: true,
+ },
+ public: {
+ type: Boolean,
+ default: true,
+ },
+ },
+}
diff --git a/packages/server/db_models/track/index.js b/packages/server/db_models/track/index.js
index 57d97664..7a440e0e 100755
--- a/packages/server/db_models/track/index.js
+++ b/packages/server/db_models/track/index.js
@@ -1,46 +1,43 @@
export default {
- name: "Track",
- collection: "tracks",
- schema: {
- source: {
- type: String,
- required: true,
- },
- title: {
- type: String,
- required: true,
- },
- album: {
- type: String,
- },
- artists: {
- type: Array,
- },
- metadata: {
- type: Object,
- },
- explicit: {
- type: Boolean,
- default: false,
- },
- public: {
- type: Boolean,
- default: true,
- },
- publish_date: {
- type: Date,
- },
- cover: {
- type: String,
- default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
- },
- publisher: {
- type: Object,
- required: true,
- },
- lyrics_enabled: {
- type: Boolean,
- default: false
- }
- }
-}
\ No newline at end of file
+ name: "Track",
+ collection: "tracks",
+ schema: {
+ source: {
+ type: String,
+ required: true,
+ },
+ title: {
+ type: String,
+ required: true,
+ },
+ album: {
+ type: String,
+ },
+ artist: {
+ type: String,
+ },
+ metadata: {
+ type: Object,
+ },
+ explicit: {
+ type: Boolean,
+ default: false,
+ },
+ public: {
+ type: Boolean,
+ default: true,
+ },
+ publish_date: {
+ type: Date,
+ },
+ cover: {
+ type: String,
+ default:
+ "https://storage.ragestudio.net/comty-static-assets/default_song.png",
+ },
+ publisher: {
+ type: Object,
+ required: true,
+ },
+ },
+}
diff --git a/packages/server/db_models/user/index.js b/packages/server/db_models/user/index.js
index fa85fd6e..9a6f2156 100755
--- a/packages/server/db_models/user/index.js
+++ b/packages/server/db_models/user/index.js
@@ -1,77 +1,76 @@
export default {
- name: "User",
- collection: "accounts",
- schema: {
- username: {
- type: String,
- required: true
- },
- password: {
- type: String,
- required: true,
- select: false
- },
- email: {
- type: String,
- required: true,
- select: false
- },
- description: {
- type: String,
- default: null
- },
- created_at: {
- type: String
- },
- public_name: {
- type: String,
- default: null
- },
- cover: {
- type: String,
- default: null
- },
- avatar: {
- type:
- String,
- default: null
- },
- roles: {
- type: Array,
- default: []
- },
- verified: {
- type: Boolean,
- default: false
- },
- badges: {
- type: Array,
- default: []
- },
- links: {
- type: Array,
- default: []
- },
- location: {
- type: String,
- default: null
- },
- birthday: {
- type: Date,
- default: null,
- select: false
- },
- accept_tos: {
- type: Boolean,
- default: false
- },
- activated: {
- type: Boolean,
- default: false,
- },
- disabled: {
- type: Boolean,
- default: false
- },
- }
-}
\ No newline at end of file
+ name: "User",
+ collection: "accounts",
+ schema: {
+ username: {
+ type: String,
+ required: true,
+ },
+ password: {
+ type: String,
+ required: true,
+ select: false,
+ },
+ email: {
+ type: String,
+ required: true,
+ select: false,
+ },
+ description: {
+ type: String,
+ default: null,
+ },
+ created_at: {
+ type: String,
+ },
+ public_name: {
+ type: String,
+ default: null,
+ },
+ cover: {
+ type: String,
+ default: null,
+ },
+ avatar: {
+ type: String,
+ default: null,
+ },
+ roles: {
+ type: Array,
+ default: [],
+ },
+ verified: {
+ type: Boolean,
+ default: false,
+ },
+ badges: {
+ type: Array,
+ default: [],
+ },
+ links: {
+ type: Array,
+ default: [],
+ },
+ location: {
+ type: String,
+ default: null,
+ },
+ birthday: {
+ type: Date,
+ default: null,
+ select: false,
+ },
+ accept_tos: {
+ type: Boolean,
+ default: false,
+ },
+ activated: {
+ type: Boolean,
+ default: false,
+ },
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
+ },
+}
diff --git a/packages/server/dev.sh b/packages/server/dev.sh
new file mode 100755
index 00000000..0d78dc56
--- /dev/null
+++ b/packages/server/dev.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+node --run dev
diff --git a/packages/server/gateway/index.js b/packages/server/gateway/index.js
index 559f5ec7..fba8d70c 100755
--- a/packages/server/gateway/index.js
+++ b/packages/server/gateway/index.js
@@ -181,19 +181,11 @@ export default class Gateway {
serviceId: id,
path: path,
target: `${http.proto}://${listen.ip}:${listen.port}${path}`,
+ websocket: !!websocket,
})
}
}
- if (websocket && websocket.enabled === true) {
- await this.gateway.register({
- serviceId: id,
- websocket: true,
- path: websocket.path,
- target: `${http.proto}://${listen.ip}:${listen.port}${websocket.path}`,
- })
- }
-
if (this.state.allReady) {
if (typeof this.gateway.applyConfiguration === "function") {
await this.gateway.applyConfiguration()
diff --git a/packages/server/gateway/managers/nginx/index.js b/packages/server/gateway/managers/nginx/index.js
index 3b500e3b..ec9d6127 100755
--- a/packages/server/gateway/managers/nginx/index.js
+++ b/packages/server/gateway/managers/nginx/index.js
@@ -6,6 +6,7 @@ import defaults from "linebridge/dist/defaults"
const localNginxBinary = path.resolve(process.cwd(), "nginx-bin")
const serverPkg = require("../../../package.json")
+
/**
* NginxManager - Optimized version that batches configurations
* Waits for all services to register before applying configuration
@@ -253,7 +254,7 @@ http {
if (debugFlag) {
console.log(
- `🔍 Registering route for [${serviceId}]: ${normalizedPath} -> ${target} (${websocket ? "WebSocket" : "HTTP"})`,
+ `🔍 Registering route for [${serviceId}]: ${normalizedPath} -> ${target}`,
)
}
@@ -261,8 +262,8 @@ http {
const effectivePathRewrite = pathRewrite || {}
this.routes.set(normalizedPath, {
- serviceId,
- target,
+ serviceId: serviceId,
+ target: target,
pathRewrite: effectivePathRewrite,
websocket: !!websocket,
})
diff --git a/packages/server/gateway/services/service.js b/packages/server/gateway/services/service.js
index a4666db2..ee2e9a17 100755
--- a/packages/server/gateway/services/service.js
+++ b/packages/server/gateway/services/service.js
@@ -55,7 +55,8 @@ export default class Service {
this.instance = await spawnService({
id: this.id,
- service: this.path,
+ service: this,
+ path: this.path,
cwd: this.cwd,
onClose: this.handleClose.bind(this),
onError: this.handleError.bind(this),
@@ -140,8 +141,7 @@ export default class Service {
// Kill the current process if is running
if (this.instance.exitCode === null) {
- console.log(`[${this.id}] Killing current process...`)
- await this.instance.kill("SIGKILL")
+ await this.instance.kill()
}
// Start a new process
@@ -153,17 +153,13 @@ export default class Service {
/**
* Stop the service
*/
- async stop() {
+ stop() {
console.log(`[${this.id}] Stopping service...`)
- if (this.fileWatcher) {
- await this.fileWatcher.close()
- this.fileWatcher = null
- }
+ this.instance.kill()
- if (this.instance) {
- await this.instance.kill("SIGKILL")
- this.instance = null
+ if (this.fileWatcher) {
+ this.fileWatcher.close()
}
}
diff --git a/packages/server/gateway/utils/spawnService.js b/packages/server/gateway/utils/spawnService.js
index ea1268b2..70212704 100755
--- a/packages/server/gateway/utils/spawnService.js
+++ b/packages/server/gateway/utils/spawnService.js
@@ -3,21 +3,29 @@ import createServiceLogTransformer from "./createServiceLogTransformer"
import Vars from "../vars"
-export default async ({ id, service, cwd, onClose, onError, onIPCData }) => {
+export default async ({
+ id,
+ service,
+ path,
+ cwd,
+ onClose,
+ onError,
+ onIPCData,
+}) => {
const instanceEnv = {
...process.env,
- lb_service: {
- id: service.id,
- index: service.index,
- },
+ lb_service_id: service.id,
+ lb_service_path: service.path,
+ lb_service_version: service.version,
+ lb_service_cwd: service.cwd,
+ lb_service: true,
}
- let instance = ChildProcess.fork(Vars.bootloaderBin, [service], {
+ let instance = ChildProcess.fork(Vars.bootloaderBin, [path], {
detached: false,
silent: true,
cwd: cwd,
env: instanceEnv,
- killSignal: "SIGTERM",
})
instance.logs = {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4c8a1e98..989d16bd 100755
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
{
"name": "@comty/server",
- "version": "1.31.0@alpha",
+ "version": "1.38.0@alpha",
"license": "ComtyLicense",
"private": true,
"workspaces": [
diff --git a/packages/server/scripts/installLatestFfmpeg.sh b/packages/server/scripts/installLatestFfmpeg.sh
new file mode 100755
index 00000000..81f5abc7
--- /dev/null
+++ b/packages/server/scripts/installLatestFfmpeg.sh
@@ -0,0 +1,165 @@
+#!/bin/bash
+
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[0;33m'
+NC='\033[0m'
+
+detect_os() {
+ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+ echo "linux"
+ else
+ echo "unsupported"
+ fi
+}
+
+detect_arch() {
+ ARCH=$(uname -m)
+ if [[ "$ARCH" == "x86_64" ]]; then
+ echo "amd64"
+ elif [[ "$ARCH" == "aarch64" ]] || [[ "$ARCH" == "arm64" ]]; then
+ echo "arm64"
+ elif [[ "$ARCH" == "armv7l" ]]; then
+ echo "armhf"
+ else
+ echo "unsupported"
+ fi
+}
+
+OS=$(detect_os)
+ARCH=$(detect_arch)
+
+if [[ "$OS" == "unsupported" ]] || [[ "$ARCH" == "unsupported" ]]; then
+ echo -e "${RED}Operating system or architecture not supported. This script only supports Linux on amd64, arm64, or armhf architectures.${NC}"
+ exit 1
+fi
+
+INSTALL_DIR="$HOME/.local/bin"
+TEMP_DIR="/tmp/ffmpegdl"
+
+if [[ -d "$TEMP_DIR" ]]; then
+ rm -rf "$TEMP_DIR"
+fi
+
+mkdir -p "$TEMP_DIR"
+
+if [[ ! -d "$INSTALL_DIR" ]]; then
+ echo -e "${RED}$INSTALL_DIR is not a directory.${NC}"
+ exit 1
+fi
+
+download_ffmpeg() {
+ echo -e "${YELLOW}Downloading the latest stable version of FFmpeg...${NC}"
+
+ # Base URL for downloads from John van Sickle's FFmpeg builds
+ BASE_URL="https://johnvansickle.com/ffmpeg/releases"
+
+ # Map architecture to the expected format in the URL
+ if [[ "$ARCH" == "amd64" ]]; then
+ URL_ARCH="amd64"
+ elif [[ "$ARCH" == "arm64" ]]; then
+ URL_ARCH="arm64"
+ elif [[ "$ARCH" == "armhf" ]]; then
+ URL_ARCH="armhf"
+ fi
+
+ # Create the download URL for the latest release
+ FFMPEG_URL="$BASE_URL/ffmpeg-release-$URL_ARCH-static.tar.xz"
+
+ if [[ -z "$FFMPEG_URL" ]]; then
+ echo -e "${RED}Could not determine the download URL for your system.${NC}"
+ exit 1
+ fi
+
+ # Download the file
+ ARCHIVE_FILE="$TEMP_DIR/ffmpeg.tar.xz"
+ echo -e "${YELLOW}Downloading from: $FFMPEG_URL${NC}"
+
+ if command -v wget > /dev/null; then
+ wget -q --show-progress -O "$ARCHIVE_FILE" "$FFMPEG_URL"
+ elif command -v curl > /dev/null; then
+ curl -L -o "$ARCHIVE_FILE" "$FFMPEG_URL"
+ else
+ echo -e "${RED}wget or curl is required to download FFmpeg.${NC}"
+ exit 1
+ fi
+
+ if [[ $? -ne 0 ]]; then
+ echo -e "${RED}Error downloading FFmpeg.${NC}"
+ exit 1
+ fi
+
+ echo -e "${GREEN}Download completed.${NC}"
+
+ # Extract the file
+ echo -e "${YELLOW}Extracting files...${NC}"
+ cd "$TEMP_DIR"
+ tar -xf "$ARCHIVE_FILE"
+
+ if [[ $? -ne 0 ]]; then
+ echo -e "${RED}Error extracting the file.${NC}"
+ exit 1
+ fi
+
+ echo -e "${GREEN}Extraction completed.${NC}"
+
+ # Clean up downloaded file
+ rm "$ARCHIVE_FILE"
+}
+
+install_binaries() {
+ echo -e "${YELLOW}Installing binaries...${NC}"
+
+ # Find the extracted directory
+ EXTRACTED_DIR=$(find "$TEMP_DIR" -maxdepth 1 -type d -name "ffmpeg-*" | head -n 1)
+
+ if [[ -z "$EXTRACTED_DIR" ]]; then
+ echo -e "${RED}FFmpeg extracted directory not found.${NC}"
+ exit 1
+ fi
+
+ # Find the binaries
+ FFMPEG_BIN="$EXTRACTED_DIR/ffmpeg"
+ FFPROBE_BIN="$EXTRACTED_DIR/ffprobe"
+
+ # Verify binaries exist
+ if [[ ! -f "$FFMPEG_BIN" ]] || [[ ! -f "$FFPROBE_BIN" ]]; then
+ echo -e "${RED}FFmpeg and FFprobe binaries not found.${NC}"
+ exit 1
+ fi
+
+ # Copy binaries to the bin folder
+ mv "$FFMPEG_BIN" "$INSTALL_DIR/ffmpeg"
+ mv "$FFPROBE_BIN" "$INSTALL_DIR/ffprobe"
+
+ # Make binaries executable
+ chmod +x "$INSTALL_DIR/ffmpeg"
+ chmod +x "$INSTALL_DIR/ffprobe"
+
+ echo -e "${GREEN}Binaries installed in $INSTALL_DIR${NC}"
+
+ # Clean up extracted directory
+ rm -rf "$EXTRACTED_DIR"
+ rm -rf "$TEMP_DIR"
+}
+
+show_versions() {
+ echo -e "${YELLOW}Verifying the installation...${NC}"
+
+ FFMPEG_PATH="$INSTALL_DIR/ffmpeg"
+ FFPROBE_PATH="$INSTALL_DIR/ffprobe"
+
+ echo -e "${GREEN}FFmpeg installed at: $FFMPEG_PATH${NC}"
+ if [[ -x "$FFMPEG_PATH" ]]; then
+ "$FFMPEG_PATH" -version | head -n 1
+ fi
+
+ echo -e "${GREEN}FFprobe installed at: $FFPROBE_PATH${NC}"
+ if [[ -x "$FFPROBE_PATH" ]]; then
+ "$FFPROBE_PATH" -version | head -n 1
+ fi
+}
+
+download_ffmpeg
+install_binaries
+show_versions
diff --git a/packages/server/services/auth/classes/account/methods/loginStrategy.js b/packages/server/services/auth/classes/account/methods/loginStrategy.js
index 7655d1a2..537a2a27 100644
--- a/packages/server/services/auth/classes/account/methods/loginStrategy.js
+++ b/packages/server/services/auth/classes/account/methods/loginStrategy.js
@@ -2,31 +2,25 @@ import bcrypt from "bcrypt"
import { User } from "@db_models"
export default async ({ username, password, hash }, user) => {
- if (typeof user === "undefined") {
- let isEmail = username.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)
+ if (typeof user === "undefined") {
+ let isEmail = username.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)
- let query = isEmail ? { email: username } : { username: username }
+ let query = isEmail ? { email: username } : { username: username }
- user = await User.findOne(query).select("+email").select("+password")
- }
+ user = await User.findOne(query).select("+email").select("+password")
+ }
- if (!user) {
- throw new OperationError(401, "User not found")
- }
+ if (!user) {
+ throw new OperationError(401, "User not found")
+ }
- if (user.disabled == true) {
- throw new OperationError(401, "User is disabled")
- }
+ if (user.disabled == true) {
+ throw new OperationError(401, "User is disabled")
+ }
- if (typeof hash !== "undefined") {
- if (user.password !== hash) {
- throw new OperationError(401, "Invalid credentials")
- }
- } else {
- if (!bcrypt.compareSync(password, user.password)) {
- throw new OperationError(401, "Invalid credentials")
- }
- }
+ if (!bcrypt.compareSync(password, user.password)) {
+ throw new OperationError(401, "Invalid credentials")
+ }
- return user
-}
\ No newline at end of file
+ return user
+}
diff --git a/packages/server/services/auth/package.json b/packages/server/services/auth/package.json
index 932e2eb2..2c943a0e 100644
--- a/packages/server/services/auth/package.json
+++ b/packages/server/services/auth/package.json
@@ -1,4 +1,3 @@
{
- "name": "auth",
- "version": "1.0.0"
+ "name": "auth"
}
diff --git a/packages/server/services/chats/package.json b/packages/server/services/chats/package.json
index 4e136e1b..9a34bc34 100755
--- a/packages/server/services/chats/package.json
+++ b/packages/server/services/chats/package.json
@@ -1,4 +1,3 @@
{
- "name": "chats",
- "version": "0.60.2"
-}
\ No newline at end of file
+ "name": "chats"
+}
diff --git a/packages/server/services/ems/ems.service.js b/packages/server/services/ems/ems.service.js
index 3efc85af..42eaf6c4 100644
--- a/packages/server/services/ems/ems.service.js
+++ b/packages/server/services/ems/ems.service.js
@@ -3,40 +3,42 @@ import nodemailer from "nodemailer"
import DbManager from "@shared-classes/DbManager"
import SharedMiddlewares from "@shared-middlewares"
+
export default class API extends Server {
- static refName = "ems"
- static useEngine = "hyper-express"
- static routesPath = `${__dirname}/routes`
- static listen_port = process.env.HTTP_LISTEN_PORT ?? 3007
+ static refName = "ems"
+ static useEngine = "hyper-express"
+ static routesPath = `${__dirname}/routes`
+ static listen_port = process.env.HTTP_LISTEN_PORT ?? 3007
- middlewares = {
- ...SharedMiddlewares
- }
+ middlewares = {
+ ...SharedMiddlewares,
+ }
- contexts = {
- db: new DbManager(),
- mailTransporter: nodemailer.createTransport({
- host: process.env.SMTP_HOSTNAME,
- port: process.env.SMTP_PORT ?? 587,
- secure: ToBoolean(process.env.SMTP_SECURE) ?? false,
- auth: {
- user: process.env.SMTP_USERNAME,
- pass: process.env.SMTP_PASSWORD,
- },
- }),
- }
+ contexts = {
+ db: new DbManager(),
+ mailTransporter: nodemailer.createTransport({
+ host: process.env.SMTP_HOSTNAME,
+ port: process.env.SMTP_PORT ?? 587,
+ secure: ToBoolean(process.env.SMTP_SECURE) ?? false,
+ auth: {
+ user: process.env.SMTP_USERNAME,
+ pass: process.env.SMTP_PASSWORD,
+ },
+ }),
+ }
- ipcEvents = {
- "account:activation:send": require("./ipcEvents/accountActivation").default,
- "new:login": require("./ipcEvents/newLogin").default,
- "mfa:send": require("./ipcEvents/mfaSend").default,
- "apr:send": require("./ipcEvents/aprSend").default,
- "password:changed": require("./ipcEvents/passwordChanged").default,
- }
+ ipcEvents = {
+ "account:activation:send": require("./ipcEvents/accountActivation")
+ .default,
+ "new:login": require("./ipcEvents/newLogin").default,
+ "mfa:send": require("./ipcEvents/mfaSend").default,
+ "apr:send": require("./ipcEvents/aprSend").default,
+ "password:changed": require("./ipcEvents/passwordChanged").default,
+ }
- async onInitialize() {
- await this.contexts.db.initialize()
- }
+ async onInitialize() {
+ await this.contexts.db.initialize()
+ }
}
-Boot(API)
\ No newline at end of file
+Boot(API)
diff --git a/packages/server/services/ems/package.json b/packages/server/services/ems/package.json
index 0f28a259..142583aa 100644
--- a/packages/server/services/ems/package.json
+++ b/packages/server/services/ems/package.json
@@ -1,10 +1,7 @@
{
- "name": "ems",
- "description": "External Messaging Service (SMS, EMAIL, PUSH)",
- "version": "0.1.0",
- "dependencies": {
- "handlebars": "^4.7.8",
- "nodemailer": "^6.9.11",
- "web-push": "^3.6.7"
- }
+ "name": "ems",
+ "dependencies": {
+ "handlebars": "^4.7.8",
+ "nodemailer": "^6.9.11"
+ }
}
diff --git a/packages/server/services/files/classes/ChunkFileUpload/index.js b/packages/server/services/files/classes/ChunkFile/index.js
similarity index 81%
rename from packages/server/services/files/classes/ChunkFileUpload/index.js
rename to packages/server/services/files/classes/ChunkFile/index.js
index 8c677970..b480016d 100755
--- a/packages/server/services/files/classes/ChunkFileUpload/index.js
+++ b/packages/server/services/files/classes/ChunkFile/index.js
@@ -104,11 +104,9 @@ export function createAssembleChunksPromise({
export async function handleChunkFile(
fileStream,
- { tmpDir, headers, maxFileSize, maxChunkSize },
+ { chunksPath, outputDir, headers, maxFileSize, maxChunkSize },
) {
return await new Promise(async (resolve, reject) => {
- const workPath = path.join(tmpDir, headers["uploader-file-id"])
- const chunksPath = path.join(workPath, "chunks")
const chunkPath = path.join(
chunksPath,
headers["uploader-chunk-number"],
@@ -125,17 +123,6 @@ export async function handleChunkFile(
return reject(new OperationError(500, "Chunk is out of range"))
}
- // if is the first chunk check if dir exists before write things
- if (chunkCount === 0) {
- try {
- if (!(await fs.promises.stat(chunksPath).catch(() => false))) {
- await fs.promises.mkdir(chunksPath, { recursive: true })
- }
- } catch (error) {
- return reject(new OperationError(500, error.message))
- }
- }
-
let dataWritten = 0
let writeStream = fs.createWriteStream(chunkPath)
@@ -172,25 +159,18 @@ export async function handleChunkFile(
}
if (isLast) {
- const mimetype = mimetypes.lookup(
- headers["uploader-original-name"],
- )
- const extension = mimetypes.extension(mimetype)
+ // const mimetype = mimetypes.lookup(
+ // headers["uploader-original-name"],
+ // )
+ // const extension = mimetypes.extension(mimetype)
- let filename = headers["uploader-file-id"]
-
- if (headers["uploader-use-date"] === "true") {
- filename = `${filename}_${Date.now()}`
- }
+ let filename = nanoid()
return resolve(
createAssembleChunksPromise({
// build data
chunksPath: chunksPath,
- filePath: path.resolve(
- workPath,
- `${filename}.${extension}`,
- ),
+ filePath: path.resolve(outputDir, filename),
maxFileSize: maxFileSize,
}),
)
diff --git a/packages/server/services/files/file.service.js b/packages/server/services/files/file.service.js
index 0e0db8b2..7c2ce7f1 100755
--- a/packages/server/services/files/file.service.js
+++ b/packages/server/services/files/file.service.js
@@ -1,21 +1,21 @@
import { Server } from "linebridge"
-import B2 from "backblaze-b2"
-
import DbManager from "@shared-classes/DbManager"
+import RedisClient from "@shared-classes/RedisClient"
import StorageClient from "@shared-classes/StorageClient"
import CacheService from "@shared-classes/CacheService"
import SSEManager from "@shared-classes/SSEManager"
-import SharedMiddlewares from "@shared-middlewares"
import LimitsClass from "@shared-classes/Limits"
import TaskQueueManager from "@shared-classes/TaskQueueManager"
+import SharedMiddlewares from "@shared-middlewares"
+
class API extends Server {
static refName = "files"
- static useEngine = "hyper-express"
+ static useEngine = "hyper-express-ng"
static routesPath = `${__dirname}/routes`
static listen_port = process.env.HTTP_LISTEN_PORT ?? 3002
- static enableWebsockets = true
+ //static enableWebsockets = true
middlewares = {
...SharedMiddlewares,
@@ -24,10 +24,13 @@ class API extends Server {
contexts = {
db: new DbManager(),
cache: new CacheService(),
+ SSEManager: new SSEManager(),
+ redis: RedisClient({
+ maxRetriesPerRequest: null,
+ }),
+ limits: {},
storage: StorageClient(),
b2Storage: null,
- SSEManager: new SSEManager(),
- limits: {},
}
queuesManager = new TaskQueueManager(
@@ -41,27 +44,35 @@ class API extends Server {
global.sse = this.contexts.SSEManager
if (process.env.B2_KEY_ID && process.env.B2_APP_KEY) {
- this.contexts.b2Storage = new B2({
- applicationKeyId: process.env.B2_KEY_ID,
- applicationKey: process.env.B2_APP_KEY,
+ this.contexts.b2Storage = StorageClient({
+ endPoint: process.env.B2_ENDPOINT,
+ cdnUrl: process.env.B2_CDN_ENDPOINT,
+ defaultBucket: process.env.B2_BUCKET,
+ accessKey: process.env.B2_KEY_ID,
+ secretKey: process.env.B2_APP_KEY,
+ port: 443,
+ useSSL: true,
+ setupBucket: false,
})
- global.b2Storage = this.contexts.b2Storage
-
- await this.contexts.b2Storage.authorize()
+ await this.contexts.b2Storage.initialize()
} else {
console.warn(
"B2 storage not configured on environment, skipping...",
)
}
+ await this.contexts.redis.initialize()
await this.queuesManager.initialize({
- redisOptions: this.engine.ws.redis.options,
+ redisOptions: this.contexts.redis.client,
})
await this.contexts.db.initialize()
await this.contexts.storage.initialize()
- global.storage = this.contexts.storage
+ global.storages = {
+ standard: this.contexts.storage,
+ b2: this.contexts.b2Storage,
+ }
global.queues = this.queuesManager
this.contexts.limits = await LimitsClass.get()
diff --git a/packages/server/services/files/package.json b/packages/server/services/files/package.json
index a2a06202..c9a52227 100755
--- a/packages/server/services/files/package.json
+++ b/packages/server/services/files/package.json
@@ -1,20 +1,10 @@
{
- "name": "files",
- "version": "0.60.2",
- "dependencies": {
- "backblaze-b2": "^1.7.0",
- "busboy": "^1.6.0",
- "content-range": "^2.0.2",
- "ffmpeg-static": "^5.2.0",
- "fluent-ffmpeg": "^2.1.2",
- "merge-files": "^0.1.2",
- "mime-types": "^2.1.35",
- "minio": "^7.0.32",
- "normalize-url": "^8.0.0",
- "p-map": "4",
- "p-queue": "^7.3.4",
- "redis": "^4.6.6",
- "sharp": "0.32.6",
- "split-chunk-merge": "^1.0.0"
- }
+ "name": "files",
+ "dependencies": {
+ "file-type": "^20.4.1",
+ "fluent-ffmpeg": "^2.1.2",
+ "mime-types": "^2.1.35",
+ "p-map": "4",
+ "sharp": "0.32.6"
+ }
}
diff --git a/packages/server/services/files/queues/TransmuxedUpload/index.js b/packages/server/services/files/queues/TransmuxedUpload/index.js
deleted file mode 100644
index 18b2d029..00000000
--- a/packages/server/services/files/queues/TransmuxedUpload/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import path from "node:path"
-
-import fs from "node:fs"
-import RemoteUpload from "@services/remoteUpload"
-
-export default {
- id: "remote_upload",
- maxJobs: 10,
- process: async (job) => {
- const {
- filePath,
- parentDir,
- service,
- useCompression,
- cachePath,
- transmux,
- transmuxOptions,
- } = job.data
-
- console.log("[JOB][remote_upload] Processing job >", job.data)
-
- try {
- const result = await RemoteUpload({
- parentDir: parentDir,
- source: filePath,
- service: service,
- useCompression: useCompression,
- transmux: transmux,
- transmuxOptions: transmuxOptions,
- cachePath: cachePath,
- onProgress: (progress) => {
- job.updateProgress(progress)
- },
- })
-
- await fs.promises
- .rm(filePath, { recursive: true, force: true })
- .catch(() => null)
-
- return result
- } catch (error) {
- await fs.promises
- .rm(filePath, { recursive: true, force: true })
- .catch(() => null)
-
- throw error
- }
- },
-}
diff --git a/packages/server/services/files/queues/TransmuxedUpload/worker.js b/packages/server/services/files/queues/TransmuxedUpload/worker.js
deleted file mode 100644
index 39bf8728..00000000
--- a/packages/server/services/files/queues/TransmuxedUpload/worker.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import RemoteUpload from "@services/remoteUpload"
-import fs from "node:fs"
-
-module.exports = async (job) => {
- const {
- filePath,
- parentDir,
- service,
- useCompression,
- cachePath,
- transmux,
- transmuxOptions,
- } = job.data
-
- console.log("[JOB][remote_upload] Processing job >", job.data)
-
- try {
- const result = await RemoteUpload({
- parentDir: parentDir,
- source: filePath,
- service: service,
- useCompression: useCompression,
- transmux: transmux,
- transmuxOptions: transmuxOptions,
- cachePath: cachePath,
- onProgress: (progress) => {
- job.progress(progress)
- },
- })
-
- await fs.promises
- .rm(filePath, { recursive: true, force: true })
- .catch(() => null)
-
- return result
- } catch (error) {
- await fs.promises
- .rm(filePath, { recursive: true, force: true })
- .catch(() => null)
-
- throw error
- }
-}
diff --git a/packages/server/services/files/queues/fileProcess/index.js b/packages/server/services/files/queues/fileProcess/index.js
new file mode 100644
index 00000000..663a0d10
--- /dev/null
+++ b/packages/server/services/files/queues/fileProcess/index.js
@@ -0,0 +1,29 @@
+import path from "node:path"
+import fs from "node:fs"
+
+import Upload from "@shared-classes/Upload"
+
+export default {
+ id: "file-process",
+ maxJobs: 2,
+ process: async (job) => {
+ console.log("[JOB][file-process] starting... >", job.data)
+
+ try {
+ const result = await Upload.fileHandle({
+ ...job.data,
+ onProgress: (progress) => {
+ job.updateProgress(progress)
+ },
+ })
+
+ return result
+ } catch (error) {
+ await fs.promises
+ .rm(job.workPath, { recursive: true, force: true })
+ .catch(() => null)
+
+ throw error
+ }
+ },
+}
diff --git a/packages/server/services/files/routes/stream/[$]/get.js b/packages/server/services/files/routes/stream/[$]/get.js
deleted file mode 100644
index 8ecf5ffc..00000000
--- a/packages/server/services/files/routes/stream/[$]/get.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import mimetypes from "mime-types"
-
-export default {
- useContext: ["storage"],
- fn: async (req, res) => {
- const streamPath = req.path.replace(req.route.pattern.replace("*", ""), "/")
-
- this.default.contexts.storage.getObject(process.env.S3_BUCKET, streamPath, (err, dataStream) => {
- if (err) {
- return res.status(404).end()
- }
-
- const extname = mimetypes.lookup(streamPath)
-
- // send chunked response
- res.status(200)
-
- // set headers
- res.setHeader("Content-Type", extname)
- res.setHeader("Accept-Ranges", "bytes")
-
- return dataStream.pipe(res)
- })
- }
-}
\ No newline at end of file
diff --git a/packages/server/services/files/routes/transcode/get.js b/packages/server/services/files/routes/transcode/get.js
deleted file mode 100644
index b358bf41..00000000
--- a/packages/server/services/files/routes/transcode/get.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import path from "node:path"
-import fs from "node:fs"
-import axios from "axios"
-
-import MultiqualityHLSJob from "@shared-classes/MultiqualityHLSJob"
-import { standardUpload } from "@services/remoteUpload"
-
-export default {
- useContext: ["cache", "limits"],
- middlewares: ["withAuthentication"],
- fn: async (req, res) => {
- const { url } = req.query
-
- const userPath = path.join(this.default.contexts.cache.constructor.cachePath, req.auth.session.user_id)
-
- const jobId = String(new Date().getTime())
- const jobPath = path.resolve(userPath, "jobs", jobId)
-
- const sourcePath = path.resolve(jobPath, `${jobId}.source`)
-
- if (!fs.existsSync(jobPath)) {
- fs.mkdirSync(jobPath, { recursive: true })
- }
-
- const sourceStream = fs.createWriteStream(sourcePath)
-
- const response = await axios({
- method: "get",
- url,
- responseType: "stream",
- })
-
- response.data.pipe(sourceStream)
-
- await new Promise((resolve, reject) => {
- sourceStream.on("finish", () => {
- resolve()
- })
- sourceStream.on("error", (err) => {
- reject(err)
- })
- })
-
- const job = new MultiqualityHLSJob({
- input: sourcePath,
- outputDir: jobPath,
- levels: [
- {
- original: true,
- codec: "libx264",
- bitrate: "10M",
- preset: "ultrafast",
- },
- {
- codec: "libx264",
- width: 1280,
- bitrate: "3M",
- preset: "ultrafast",
- }
- ]
- })
-
- await new Promise((resolve, reject) => {
- job
- .on("error", (err) => {
- console.error(`[TRANSMUX] Transmuxing failed`, err)
- reject(err)
- })
- .on("end", () => {
- console.debug(`[TRANSMUX] Finished transmuxing > ${sourcePath}`)
- resolve()
- })
- .run()
- })
-
- const result = await standardUpload({
- isDirectory: true,
- source: path.join(jobPath, "hls"),
- remotePath: `${req.auth.session.user_id}/jobs/${jobId}`,
- })
-
- fs.rmSync(jobPath, { recursive: true, force: true })
-
- return {
- result
- }
- }
-}
\ No newline at end of file
diff --git a/packages/server/services/files/routes/upload/chunk/post.js b/packages/server/services/files/routes/upload/chunk/post.js
index 63ff90fd..9fd08b53 100644
--- a/packages/server/services/files/routes/upload/chunk/post.js
+++ b/packages/server/services/files/routes/upload/chunk/post.js
@@ -1,21 +1,12 @@
-import { Duplex } from "node:stream"
import path from "node:path"
import fs from "node:fs"
-import RemoteUpload from "@services/remoteUpload"
-import {
- checkChunkUploadHeaders,
- handleChunkFile,
-} from "@classes/ChunkFileUpload"
+
+import { checkChunkUploadHeaders, handleChunkFile } from "@classes/ChunkFile"
+import Upload from "@shared-classes/Upload"
+import bufferToStream from "@shared-utils/bufferToStream"
const availableProviders = ["b2", "standard"]
-function bufferToStream(bf) {
- let tmp = new Duplex()
- tmp.push(bf)
- tmp.push(null)
- return tmp
-}
-
export default {
useContext: ["cache", "limits"],
middlewares: ["withAuthentication"],
@@ -25,14 +16,16 @@ export default {
return
}
- const uploadId = `${req.headers["uploader-file-id"]}_${Date.now()}`
+ const uploadId = `${req.headers["uploader-file-id"]}`
- const tmpPath = path.resolve(
+ const workPath = path.resolve(
this.default.contexts.cache.constructor.cachePath,
- req.auth.session.user_id,
+ `${req.auth.session.user_id}-${uploadId}`,
)
+ const chunksPath = path.join(workPath, "chunks")
+ const assembledPath = path.join(workPath, "assembled")
- const limits = {
+ const config = {
maxFileSize:
parseInt(this.default.contexts.limits.maxFileSizeInMB) *
1024 *
@@ -42,93 +35,91 @@ export default {
1024 *
1024,
useCompression: true,
- useProvider: "standard",
+ useProvider: req.headers["use-provider"] ?? "standard",
}
// const user = await req.auth.user()
-
// if (user.roles.includes("admin")) {
// // maxFileSize for admins 100GB
// limits.maxFileSize = 100 * 1024 * 1024 * 1024
-
// // optional compression for admins
// limits.useCompression = req.headers["use-compression"] ?? false
-
// limits.useProvider = req.headers["provider-type"] ?? "b2"
// }
// check if provider is valid
- if (!availableProviders.includes(limits.useProvider)) {
+ if (!availableProviders.includes(config.useProvider)) {
throw new OperationError(400, "Invalid provider")
}
- // create a readable stream from req.body(buffer)
+ await fs.promises.mkdir(workPath, { recursive: true })
+ await fs.promises.mkdir(chunksPath, { recursive: true })
+ await fs.promises.mkdir(assembledPath, { recursive: true })
+
+ // create a readable stream
const dataStream = bufferToStream(await req.buffer())
- let result = await handleChunkFile(dataStream, {
- tmpDir: tmpPath,
+ let assemble = await handleChunkFile(dataStream, {
+ chunksPath: chunksPath,
+ outputDir: assembledPath,
headers: req.headers,
- maxFileSize: limits.maxFileSize,
- maxChunkSize: limits.maxChunkSize,
+ maxFileSize: config.maxFileSize,
+ maxChunkSize: config.maxChunkSize,
})
- if (typeof result === "function") {
+ if (typeof assemble === "function") {
try {
- result = await result()
+ assemble = await assemble()
- if (req.headers["transmux"] || limits.useCompression === true) {
- // add a background task
+ let transformations = req.headers["transformations"]
+
+ if (transformations) {
+ transformations = transformations
+ .split(",")
+ .map((t) => t.trim())
+ }
+
+ const payload = {
+ user_id: req.auth.session.user_id,
+ uploadId: uploadId,
+ filePath: assemble.filePath,
+ workPath: workPath,
+ transformations: transformations,
+ s3Provider: config.useProvider,
+ useCompression: config.useCompression,
+ }
+
+ // if has transformations, use background job
+ if (
+ (transformations && transformations.length > 0) ||
+ config.useCompression
+ ) {
const job = await global.queues.createJob(
- "remote_upload",
- {
- filePath: result.filePath,
- parentDir: req.auth.session.user_id,
- service: limits.useProvider,
- useCompression: limits.useCompression,
- transmux: req.headers["transmux"] ?? false,
- transmuxOptions: req.headers["transmux-options"],
- cachePath: tmpPath,
- },
+ "file-process",
+ payload,
{
useSSE: true,
},
)
- const sseChannelId = job.sseChannelId
-
return {
- uploadId: uploadId,
- sseChannelId: sseChannelId,
- eventChannelURL: `${req.headers["x-forwarded-proto"] || req.protocol}://${req.get("host")}/upload/sse_events/${sseChannelId}`,
+ uploadId: payload.uploadId,
+ sseChannelId: job.sseChannelId,
+ sseUrl: `${req.headers["x-forwarded-proto"] || req.protocol}://${req.get("host")}/upload/sse_events/${job.sseChannelId}`,
}
- } else {
- const result = await RemoteUpload({
- source: result.filePath,
- parentDir: req.auth.session.user_id,
- service: limits.useProvider,
- useCompression: limits.useCompression,
- cachePath: tmpPath,
- })
-
- return result
}
- } catch (error) {
- await fs.promises
- .rm(tmpPath, { recursive: true, force: true })
- .catch(() => {
- return false
- })
- throw new OperationError(
- error.code ?? 500,
- error.message ?? "Failed to upload file",
- )
+ return await Upload.fileHandle(payload)
+ } catch (error) {
+ await fs.promises.rm(workPath, { recursive: true })
+ throw error
}
}
return {
- ok: 1,
+ next: true,
chunkNumber: req.headers["uploader-chunk-number"],
+ config: config,
}
},
}
diff --git a/packages/server/services/files/routes/upload/file/post.js b/packages/server/services/files/routes/upload/file/post.js
index 37a0a687..b4c79071 100644
--- a/packages/server/services/files/routes/upload/file/post.js
+++ b/packages/server/services/files/routes/upload/file/post.js
@@ -1,48 +1,50 @@
import path from "node:path"
import fs from "node:fs"
-import RemoteUpload from "@services/remoteUpload"
+import Upload from "@shared-classes/Upload"
export default {
- useContext: ["cache"],
- middlewares: [
- "withAuthentication",
- ],
- fn: async (req, res) => {
- const { cache } = this.default.contexts
+ useContext: ["cache"],
+ middlewares: ["withAuthentication"],
+ fn: async (req, res) => {
+ const workPath = path.resolve(
+ this.default.contexts.cache.constructor.cachePath,
+ `${req.auth.session.user_id}-${nanoid()}`,
+ )
- const providerType = req.headers["provider-type"] ?? "standard"
+ await fs.promises.mkdir(workPath, { recursive: true })
- const userPath = path.join(cache.constructor.cachePath, req.auth.session.user_id)
+ let localFilepath = null
- let localFilepath = null
- let tmpPath = path.resolve(userPath, `${Date.now()}`)
+ await req.multipart(async (field) => {
+ if (!field.file) {
+ throw new OperationError(400, "Missing file")
+ }
- await req.multipart(async (field) => {
- if (!field.file) {
- throw new OperationError(400, "Missing file")
- }
+ localFilepath = path.join(workPath, "file")
- localFilepath = path.join(tmpPath, field.file.name)
+ await field.write(localFilepath)
+ })
- const existTmpDir = await fs.promises.stat(tmpPath).then(() => true).catch(() => false)
+ let transformations = req.headers["transformations"]
- if (!existTmpDir) {
- await fs.promises.mkdir(tmpPath, { recursive: true })
- }
+ if (transformations) {
+ transformations = transformations.split(",").map((t) => t.trim())
+ }
- await field.write(localFilepath)
- })
+ const result = await Upload.fileHandle({
+ user_id: req.auth.session.user_id,
+ filePath: localFilepath,
+ workPath: workPath,
+ transformations: transformations,
+ })
- const result = await RemoteUpload({
- parentDir: req.auth.session.user_id,
- source: localFilepath,
- service: providerType,
- useCompression: ToBoolean(req.headers["use-compression"]) ?? true,
- })
+ res.header("deprecated", "true")
+ res.header(
+ "deprecation-replacement",
+ "Use the new chunked upload API endpoint",
+ )
- fs.promises.rm(tmpPath, { recursive: true, force: true })
-
- return result
- }
+ return result
+ },
}
diff --git a/packages/server/services/files/services/post-process/audio/index.js b/packages/server/services/files/services/post-process/audio/index.js
deleted file mode 100755
index 5794e567..00000000
--- a/packages/server/services/files/services/post-process/audio/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const ffmpeg = require("fluent-ffmpeg")
-
-export default async (file) => {
- // analize metadata
- let metadata = await new Promise((resolve, reject) => {
- ffmpeg.ffprobe(file.filepath, (err, data) => {
- if (err) {
- return reject(err)
- }
-
- resolve(data)
- })
- }).catch((err) => {
- console.error(err)
-
- return {}
- })
-
- if (metadata.format) {
- metadata = metadata.format
- }
-
- file.metadata = {
- duration: metadata.duration,
- bitrate: metadata.bit_rate,
- size: metadata.size,
- }
-
- return file
-}
\ No newline at end of file
diff --git a/packages/server/services/files/services/post-process/image/index.js b/packages/server/services/files/services/post-process/image/index.js
deleted file mode 100755
index 9ba1aacc..00000000
--- a/packages/server/services/files/services/post-process/image/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-import Sharp from "sharp"
-
-const imageProcessingConf = {
- // TODO: Get image sizeThreshold from DB
- sizeThreshold: 10 * 1024 * 1024,
- // TODO: Get image quality from DB
- imageQuality: 80,
-}
-
-const imageTypeToConfig = {
- png: {
- compressionLevel: Math.floor(imageProcessingConf.imageQuality / 100),
- },
- default: {
- quality: imageProcessingConf.imageQuality
- }
-}
-
-/**
- * Processes an image file and transforms it if it's above a certain size threshold.
- *
- * @async
- * @function
- * @param {Object} file - The file to be processed.
- * @param {string} file.filepath - The path of the file to be processed.
- * @param {string} file.hash - The hash of the file to be processed.
- * @param {string} file.cachePath - The cache path of the file to be processed.
- * @throws {Error} If the file parameter is not provided.
- * @return {Object} The processed file object.
- */
-async function processImage(file) {
- if (!file) {
- throw new Error("file is required")
- }
-
- const stat = await fs.promises.stat(file.filepath)
-
- if (stat.size < imageProcessingConf.sizeThreshold) {
- return file
- }
-
- let image = await Sharp(file.filepath)
-
- const { format } = await image.metadata()
-
- image = await image[format](imageTypeToConfig[format] ?? imageTypeToConfig.default).withMetadata()
-
- const outputFilepath = path.resolve(file.cachePath, `${file.hash}_transformed.${format}`)
-
- await image.toFile(outputFilepath)
-
- file.filepath = outputFilepath
-
- return file
-}
-
-export default processImage
\ No newline at end of file
diff --git a/packages/server/services/files/services/post-process/index.js b/packages/server/services/files/services/post-process/index.js
deleted file mode 100755
index 17726714..00000000
--- a/packages/server/services/files/services/post-process/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import fs from "node:fs"
-import mimetypes from "mime-types"
-
-import processVideo from "./video"
-import processImage from "./image"
-import processAudio from "./audio"
-
-const fileTransformer = {
- // video
- "video/avi": processVideo,
- "video/quicktime": processVideo,
- "video/mp4": processVideo,
- "video/webm": processVideo,
- //image
- "image/jpeg": processImage,
- "image/png": processImage,
- "image/gif": processImage,
- "image/bmp": processImage,
- "image/tiff": processImage,
- "image/webp": processImage,
- "image/jfif": processImage,
- // audio
- "audio/flac": processAudio,
- "audio/x-flac": processAudio,
- "audio/mp3": processAudio,
- "audio/x-mp3": processAudio,
- "audio/mpeg": processAudio,
- "audio/x-mpeg": processAudio,
- "audio/ogg": processAudio,
- "audio/x-ogg": processAudio,
- "audio/wav": processAudio,
- "audio/x-wav": processAudio,
-}
-
-export default async (file) => {
- if (!file) {
- throw new Error("file is required")
- }
-
- if (!fs.existsSync(file.filepath)) {
- throw new Error(`File ${file.filepath} not found`)
- }
-
- const fileMimetype = mimetypes.lookup(file.filepath)
-
- if (typeof fileTransformer[fileMimetype] !== "function") {
- console.debug(`File (${file.filepath}) has mimetype ${fileMimetype} and will not be processed`)
-
- return file
- }
-
- return await fileTransformer[fileMimetype](file)
-}
\ No newline at end of file
diff --git a/packages/server/services/files/services/post-process/video/index.js b/packages/server/services/files/services/post-process/video/index.js
deleted file mode 100755
index b4f1b644..00000000
--- a/packages/server/services/files/services/post-process/video/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import videoTranscode from "@services/videoTranscode"
-
-/**
- * Processes a video file based on the specified options.
- *
- * @async
- * @param {Object} file - The video file to process.
- * @param {Object} [options={}] - The options object to use for processing.
- * @param {string} [options.videoCodec="libx264"] - The video codec to use.
- * @param {string} [options.format="mp4"] - The format to use.
- * @param {number} [options.audioBitrate=128] - The audio bitrate to use.
- * @param {number} [options.videoBitrate=2024] - The video bitrate to use.
- * @throws {Error} Throws an error if file parameter is not provided.
- * @return {Object} The processed video file object.
- */
-async function processVideo(file, options = {}) {
- if (!file) {
- throw new Error("file is required")
- }
-
- // TODO: Get values from db
- const {
- videoCodec = "libx264",
- format = "mp4",
- audioBitrate = 128,
- videoBitrate = 3000,
- } = options
-
- const result = await videoTranscode(file.filepath, {
- videoCodec,
- format,
- audioBitrate,
- videoBitrate: [videoBitrate, true],
- extraOptions: ["-threads 2"],
- })
-
- file.filepath = result.filepath
- file.filename = result.filename
-
- return file
-}
-
-export default processVideo
diff --git a/packages/server/services/files/services/remoteUpload/index.js b/packages/server/services/files/services/remoteUpload/index.js
deleted file mode 100644
index d2c904e0..00000000
--- a/packages/server/services/files/services/remoteUpload/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-import mimeTypes from "mime-types"
-import getFileHash from "@shared-utils/readFileHash"
-
-import PostProcess from "../post-process"
-import Transmux from "../transmux"
-
-import StandardUpload from "./providers/standard"
-import B2Upload from "./providers/b2"
-
-export default async ({
- source,
- parentDir,
- service,
- useCompression,
- cachePath,
- transmux,
- transmuxOptions,
- isDirectory,
- onProgress,
-}) => {
- if (!source) {
- throw new OperationError(500, "source is required")
- }
-
- if (!service) {
- service = "standard"
- }
-
- if (!parentDir) {
- parentDir = "/"
- }
-
- if (transmuxOptions) {
- transmuxOptions = JSON.parse(transmuxOptions)
- }
-
- if (useCompression) {
- if (typeof onProgress === "function") {
- onProgress(10, {
- event: "post_processing",
- })
- }
-
- try {
- const processOutput = await PostProcess({
- filepath: source,
- cachePath: cachePath,
- })
-
- if (processOutput) {
- if (processOutput.filepath) {
- source = processOutput.filepath
- }
- }
- } catch (error) {
- console.error(error)
- throw new OperationError(500, `Failed to process file`)
- }
- }
-
- if (transmux) {
- if (typeof onProgress === "function") {
- onProgress(30, {
- event: "transmuxing",
- })
- }
-
- try {
- const processOutput = await Transmux({
- transmuxer: transmux,
- transmuxOptions: transmuxOptions,
- filepath: source,
- cachePath: cachePath,
- })
-
- if (processOutput) {
- if (processOutput.filepath) {
- source = processOutput.filepath
- }
-
- if (processOutput.isDirectory) {
- isDirectory = true
- }
- }
- } catch (error) {
- console.error(error)
- throw new OperationError(500, `Failed to transmux file`)
- }
- }
-
- const type = mimeTypes.lookup(path.basename(source))
- const hash = await getFileHash(fs.createReadStream(source))
-
- let fileId = `${hash}`
-
- // FIXME: This is a walkaround to avoid to hashing the entire directories
- if (isDirectory) {
- fileId = global.nanoid()
- }
-
- let remotePath = path.join(parentDir, fileId)
-
- let result = {}
-
- const metadata = {
- "Content-Type": type,
- "File-Hash": hash,
- }
-
- if (typeof onProgress === "function") {
- onProgress(80, {
- event: "uploading_s3",
- service: service,
- })
- }
-
- try {
- switch (service) {
- case "b2":
- if (!global.b2Storage) {
- throw new OperationError(
- 500,
- "B2 storage not configured on environment, unsupported service. Please use `standard` service.",
- )
- }
-
- result = await B2Upload({
- source: isDirectory ? path.dirname(source) : source,
- remotePath: remotePath,
- metadata: metadata,
- isDirectory: isDirectory,
- targetFilename: isDirectory ? path.basename(source) : null,
- })
- break
- case "standard":
- result = await StandardUpload({
- source: isDirectory ? path.dirname(source) : source,
- remotePath: remotePath,
- metadata: metadata,
- isDirectory: isDirectory,
- targetFilename: isDirectory ? path.basename(source) : null,
- })
- break
- default:
- throw new OperationError(500, "Unsupported service")
- }
- } catch (error) {
- console.error(error)
- throw new OperationError(500, "Failed to upload to storage")
- }
-
- if (typeof onProgress === "function") {
- onProgress(100, {
- event: "done",
- result: result,
- })
- }
-
- return result
-}
diff --git a/packages/server/services/files/services/remoteUpload/providers/b2/index.js b/packages/server/services/files/services/remoteUpload/providers/b2/index.js
deleted file mode 100644
index fb0c7c0e..00000000
--- a/packages/server/services/files/services/remoteUpload/providers/b2/index.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-import pMap from "p-map"
-
-export default async function b2Upload({
- source,
- remotePath,
- metadata = {},
- targetFilename,
- isDirectory,
- retryNumber = 0
-}) {
- if (isDirectory) {
- let files = await fs.promises.readdir(source)
-
- files = files.map((file) => {
- const filePath = path.join(source, file)
-
- const isTargetDirectory = fs.lstatSync(filePath).isDirectory()
-
- return {
- source: filePath,
- remotePath: path.join(remotePath, file),
- isDirectory: isTargetDirectory,
- }
- })
-
- await pMap(
- files,
- b2Upload,
- {
- concurrency: 5
- }
- )
-
- return {
- id: remotePath,
- url: `https://${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${remotePath}/${targetFilename}`,
- metadata: metadata,
- }
- }
-
- try {
- await global.b2Storage.authorize()
-
- if (!fs.existsSync(source)) {
- throw new OperationError(500, "File not found")
- }
-
- const uploadUrl = await global.b2Storage.getUploadUrl({
- bucketId: process.env.B2_BUCKET_ID,
- })
-
- console.debug(`Uploading object to B2 Storage >`, {
- source: source,
- remote: remotePath,
- })
-
- const data = await fs.promises.readFile(source)
-
- await global.b2Storage.uploadFile({
- uploadUrl: uploadUrl.data.uploadUrl,
- uploadAuthToken: uploadUrl.data.authorizationToken,
- fileName: remotePath,
- data: data,
- info: metadata
- })
- } catch (error) {
- console.error(error)
-
- if (retryNumber < 5) {
- return await b2Upload({
- source,
- remotePath,
- metadata,
- targetFilename,
- isDirectory,
- retryNumber: retryNumber + 1
- })
- }
-
- throw new OperationError(500, "B2 upload failed")
- }
-
- return {
- id: remotePath,
- url: `https://${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${remotePath}`,
- metadata: metadata,
- }
-}
\ No newline at end of file
diff --git a/packages/server/services/files/services/remoteUpload/providers/standard/index.js b/packages/server/services/files/services/remoteUpload/providers/standard/index.js
deleted file mode 100644
index 3dfa3fcf..00000000
--- a/packages/server/services/files/services/remoteUpload/providers/standard/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-import pMap from "p-map"
-
-export default async function standardUpload({
- source,
- remotePath,
- metadata = {},
- targetFilename,
- isDirectory,
-}) {
- if (isDirectory) {
- let files = await fs.promises.readdir(source)
-
- files = files.map((file) => {
- const filePath = path.join(source, file)
-
- const isTargetDirectory = fs.lstatSync(filePath).isDirectory()
-
- return {
- source: filePath,
- remotePath: path.join(remotePath, file),
- isDirectory: isTargetDirectory,
- }
- })
-
- await pMap(
- files,
- standardUpload,
- {
- concurrency: 3
- }
- )
-
- return {
- id: remotePath,
- url: global.storage.composeRemoteURL(remotePath, targetFilename),
- metadata: metadata,
- }
- }
-
- console.debug(`Uploading object to S3 Minio >`, {
- source: source,
- remote: remotePath,
- })
-
- // upload to storage
- await global.storage.fPutObject(process.env.S3_BUCKET, remotePath, source, metadata)
-
- // compose url
- const url = global.storage.composeRemoteURL(remotePath)
-
- return {
- id: remotePath,
- url: url,
- metadata: metadata,
- }
-}
\ No newline at end of file
diff --git a/packages/server/services/files/services/transmux/index.js b/packages/server/services/files/services/transmux/index.js
deleted file mode 100644
index 1b4d3cae..00000000
--- a/packages/server/services/files/services/transmux/index.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-
-import MultiqualityHLSJob from "@shared-classes/MultiqualityHLSJob"
-import SegmentedAudioMPDJob from "@shared-classes/SegmentedAudioMPDJob"
-
-const transmuxers = [
- {
- id: "mq-hls",
- container: "hls",
- extension: "m3u8",
- multipleOutput: true,
- buildCommand: (input, outputDir) => {
- return new MultiqualityHLSJob({
- input: input,
- outputDir: outputDir,
- outputMasterName: "master.m3u8",
- levels: [
- {
- original: true,
- codec: "libx264",
- bitrate: "10M",
- preset: "ultrafast",
- },
- {
- codec: "libx264",
- width: 1280,
- bitrate: "3M",
- preset: "ultrafast",
- }
- ]
- })
- },
- },
- {
- id: "a-dash",
- container: "dash",
- extension: "mpd",
- multipleOutput: true,
- buildCommand: (input, outputDir) => {
- return new SegmentedAudioMPDJob({
- input: input,
- outputDir: outputDir,
- outputMasterName: "master.mpd",
-
- audioCodec: "flac",
- //audioBitrate: "1600k",
- //audioSampleRate: 96000,
- segmentTime: 10,
- })
- }
- },
-]
-
-export default async (params) => {
- if (!params) {
- throw new Error("params is required")
- }
-
- if (!params.filepath) {
- throw new Error("filepath is required")
- }
-
- if (!params.cachePath) {
- throw new Error("cachePath is required")
- }
-
- if (!params.transmuxer) {
- throw new Error("transmuxer is required")
- }
-
- if (!fs.existsSync(params.filepath)) {
- throw new Error(`File ${params.filepath} not found`)
- }
-
- const transmuxer = transmuxers.find((item) => item.id === params.transmuxer)
-
- if (!transmuxer) {
- throw new Error(`Transmuxer ${params.transmuxer} not found`)
- }
-
- const jobPath = path.dirname(params.filepath)
-
- if (!fs.existsSync(path.dirname(jobPath))) {
- fs.mkdirSync(path.dirname(jobPath), { recursive: true })
- }
-
- return await new Promise((resolve, reject) => {
- try {
- const command = transmuxer.buildCommand(params.filepath, jobPath)
-
- command
- .on("progress", function (progress) {
- console.log("Processing: " + progress.percent + "% done")
- })
- .on("error", (err) => {
- reject(err)
- })
- .on("end", (data) => {
- resolve(data)
- })
- .run()
- } catch (error) {
- console.error(`[TRANSMUX] Transmuxing failed`, error)
- reject(error)
- }
- })
-}
\ No newline at end of file
diff --git a/packages/server/services/files/services/videoTranscode/index.js b/packages/server/services/files/services/videoTranscode/index.js
deleted file mode 100755
index 5d74f2a4..00000000
--- a/packages/server/services/files/services/videoTranscode/index.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import path from "path"
-
-const ffmpeg = require("fluent-ffmpeg")
-
-const defaultParams = {
- audioBitrate: 128,
- videoBitrate: 1024,
- videoCodec: "libvpx",
- audioCodec: "libvorbis",
- format: "mp4",
-}
-
-const maxTasks = 5
-
-export default (input, params = defaultParams) => {
- return new Promise((resolve, reject) => {
- if (!global.ffmpegTasks) {
- global.ffmpegTasks = []
- }
-
- if (global.ffmpegTasks.length >= maxTasks) {
- return reject(new Error("Too many transcoding tasks"))
- }
-
- const outputFilename = `${path.basename(input).split(".")[0]}_ff.${params.format ?? "webm"}`
- const outputFilepath = `${path.dirname(input)}/${outputFilename}`
-
- console.debug(`[TRANSCODING] Transcoding ${input} to ${outputFilepath}`)
-
- const onEnd = async () => {
- console.debug(
- `[TRANSCODING] Finished transcode ${input} to ${outputFilepath}`,
- )
-
- return resolve({
- filename: outputFilename,
- filepath: outputFilepath,
- })
- }
-
- const onError = (err) => {
- console.error(
- `[TRANSCODING] Transcoding ${input} to ${outputFilepath} failed`,
- err,
- )
-
- return reject(err)
- }
-
- let exec = null
-
- const commands = {
- input: input,
- ...params,
- output: outputFilepath,
- outputOptions: ["-preset veryfast"],
- }
-
- // chain methods
- for (let key in commands) {
- if (exec === null) {
- exec = ffmpeg(commands[key])
- continue
- }
-
- if (key === "extraOptions" && Array.isArray(commands[key])) {
- for (const option of commands[key]) {
- exec = exec.inputOptions(option)
- }
-
- continue
- }
-
- if (key === "outputOptions" && Array.isArray(commands[key])) {
- for (const option of commands[key]) {
- exec = exec.outputOptions(option)
- }
-
- continue
- }
-
- if (typeof exec[key] !== "function") {
- console.warn(`[TRANSCODING] Method ${key} is not a function`)
- return false
- }
-
- if (Array.isArray(commands[key])) {
- exec = exec[key](...commands[key])
- } else {
- exec = exec[key](commands[key])
- }
-
- continue
- }
-
- exec.on("error", onError).on("end", onEnd).run()
- })
-}
diff --git a/packages/server/services/files/utils/downloadFFMPEG/index.js b/packages/server/services/files/utils/downloadFFMPEG/index.js
deleted file mode 100644
index 030a68d1..00000000
--- a/packages/server/services/files/utils/downloadFFMPEG/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import fs from "node:fs"
-import os from "node:os"
-import axios from "axios"
-
-export default async (outputDir) => {
- const arch = os.arch()
-
- console.log(`Downloading ffmpeg for ${arch}...`)
- const baseURL = `https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${arch}-static.tar.xz`
-
-
- const response = await axios.get(baseURL, {
- responseType: "stream"
- })
-
- const ffmpegPath = path.join(outputDir, `ffmpeg-${arch}.tar.xz`)
- const ffmpegFile = fs.createWriteStream(ffmpegPath)
-
- response.data.pipe(ffmpegFile)
-}
\ No newline at end of file
diff --git a/packages/server/services/files/utils/resolveUrl/index.js b/packages/server/services/files/utils/resolveUrl/index.js
deleted file mode 100755
index a9a33785..00000000
--- a/packages/server/services/files/utils/resolveUrl/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export default (from, to) => {
- const resolvedUrl = new URL(to, new URL(from, "resolve://"))
-
- if (resolvedUrl.protocol === "resolve:") {
- let { pathname, search, hash } = resolvedUrl
-
- if (to.includes("@")) {
- const fromUrl = new URL(from)
- const toUrl = new URL(to, fromUrl.origin)
-
- pathname = toUrl.pathname
- search = toUrl.search
- hash = toUrl.hash
- }
-
- return pathname + search + hash
- }
-
- return resolvedUrl.toString()
-}
\ No newline at end of file
diff --git a/packages/server/services/files/utils/syncDirToRemote/index.js b/packages/server/services/files/utils/syncDirToRemote/index.js
deleted file mode 100755
index 7481c2a7..00000000
--- a/packages/server/services/files/utils/syncDirToRemote/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import fs from "fs"
-import path from "path"
-
-async function syncFolder(dir, destPath) {
- const files = await fs.promises.readdir(dir)
-
- for await (const file of files) {
- const filePath = path.resolve(dir, file)
- const desitinationFilePath = `${destPath}/${file}`
-
- const stat = fs.statSync(filePath)
-
- if (stat.isDirectory()) {
- await syncFolder(filePath, desitinationFilePath)
- } else {
- const fileContent = await fs.promises.readFile(filePath)
-
- await global.storage.putObject(process.env.S3_BUCKET, desitinationFilePath, fileContent)
- }
- }
-}
-
-export default syncFolder
\ No newline at end of file
diff --git a/packages/server/services/main/main.service.js b/packages/server/services/main/main.service.js
index 896a090d..817f6a22 100755
--- a/packages/server/services/main/main.service.js
+++ b/packages/server/services/main/main.service.js
@@ -7,9 +7,10 @@ import SharedMiddlewares from "@shared-middlewares"
export default class API extends Server {
static refName = "main"
- static enableWebsockets = true
+ static useEngine = "hyper-express-ng"
static routesPath = `${__dirname}/routes`
static listen_port = process.env.HTTP_LISTEN_PORT || 3000
+ static enableWebsockets = false
middlewares = {
...require("@middlewares").default,
@@ -26,8 +27,6 @@ export default class API extends Server {
await this.contexts.db.initialize()
await StartupDB()
}
-
- handleWsAuth = require("@shared-lib/handleWsAuth").default
}
Boot(API)
diff --git a/packages/server/services/main/package.json b/packages/server/services/main/package.json
index aaa6e4ae..0baaaa2d 100755
--- a/packages/server/services/main/package.json
+++ b/packages/server/services/main/package.json
@@ -1,7 +1,6 @@
{
- "name": "main",
- "version": "0.60.2",
- "dependencies": {
- "@octokit/rest": "^20.0.2"
- }
+ "name": "main",
+ "dependencies": {
+ "@octokit/rest": "^20.0.2"
+ }
}
diff --git a/packages/server/services/marketplace/classes/extension/methods/resolve.js b/packages/server/services/marketplace/classes/extension/methods/resolve.js
index cc61dcc5..ee542f04 100644
--- a/packages/server/services/marketplace/classes/extension/methods/resolve.js
+++ b/packages/server/services/marketplace/classes/extension/methods/resolve.js
@@ -1,24 +1,27 @@
import { Extension } from "@db_models"
export default async function resolve(payload) {
- let { user_id, pkg } = payload
+ let { user_id, pkg } = payload
- const [pkgName, pkgVersion] = pkg.split("@")
+ let [pkgName, pkgVersion] = pkg.split("@")
- if (!pkgVersion) {
- pkgVersion = "latest"
- }
+ if (!pkgVersion) {
+ pkgVersion = "latest"
+ }
- if (pkgVersion === "latest") {
- return await Extension.findOne({
- user_id,
- name: pkgName,
- }).sort({ version: -1 }).limit(1).exec()
- }
+ if (pkgVersion === "latest") {
+ return await Extension.findOne({
+ user_id,
+ name: pkgName,
+ })
+ .sort({ version: -1 })
+ .limit(1)
+ .exec()
+ }
- return await Extension.findOne({
- user_id,
- name: pkgName,
- version: pkgVersion,
- })
-}
\ No newline at end of file
+ return await Extension.findOne({
+ user_id,
+ name: pkgName,
+ version: pkgVersion,
+ })
+}
diff --git a/packages/server/services/marketplace/marketplace.service.js b/packages/server/services/marketplace/marketplace.service.js
index a01cd9da..a9d7b338 100755
--- a/packages/server/services/marketplace/marketplace.service.js
+++ b/packages/server/services/marketplace/marketplace.service.js
@@ -1,41 +1,47 @@
import { Server } from "linebridge"
-import B2 from "backblaze-b2"
import DbManager from "@shared-classes/DbManager"
import CacheService from "@shared-classes/CacheService"
+import StorageClient from "@shared-classes/StorageClient"
import SharedMiddlewares from "@shared-middlewares"
class API extends Server {
- static refName = "marketplace"
- static wsRoutesPath = `${__dirname}/ws_routes`
- static routesPath = `${__dirname}/routes`
- static listen_port = process.env.HTTP_LISTEN_PORT ?? 3005
+ static refName = "marketplace"
+ static useEngine = "hyper-express-ng"
+ static routesPath = `${__dirname}/routes`
+ static listen_port = process.env.HTTP_LISTEN_PORT ?? 3005
- middlewares = {
- ...SharedMiddlewares
- }
+ middlewares = {
+ ...SharedMiddlewares,
+ }
- contexts = {
- db: new DbManager(),
- b2: new B2({
- applicationKeyId: process.env.B2_KEY_ID,
- applicationKey: process.env.B2_APP_KEY,
- }),
- cache: new CacheService({
- fsram: false
- }),
- }
+ contexts = {
+ db: new DbManager(),
+ cache: new CacheService({
+ fsram: false,
+ }),
+ storage: StorageClient({
+ endPoint: process.env.B2_ENDPOINT,
+ cdnUrl: process.env.B2_CDN_ENDPOINT,
+ defaultBucket: process.env.B2_BUCKET,
+ accessKey: process.env.B2_KEY_ID,
+ secretKey: process.env.B2_APP_KEY,
+ port: 443,
+ useSSL: true,
+ setupBucket: false,
+ }),
+ }
- async onInitialize() {
- await this.contexts.db.initialize()
- await this.contexts.b2.authorize()
+ async onInitialize() {
+ await this.contexts.db.initialize()
+ await this.contexts.storage.initialize()
- global.cache = this.contexts.cache
- global.b2 = this.contexts.b2
- }
-
- handleWsAuth = require("@shared-lib/handleWsAuth").default
+ global.cache = this.contexts.cache
+ global.storages = {
+ standard: this.contexts.storage,
+ }
+ }
}
-Boot(API)
\ No newline at end of file
+Boot(API)
diff --git a/packages/server/services/marketplace/package.json b/packages/server/services/marketplace/package.json
index cff27833..9f272677 100755
--- a/packages/server/services/marketplace/package.json
+++ b/packages/server/services/marketplace/package.json
@@ -1,9 +1,6 @@
{
"name": "marketplace",
"dependencies": {
- "7zip-min": "^1.4.4",
- "backblaze-b2": "^1.7.0",
- "sucrase": "^3.32.0",
- "uglify-js": "^3.17.4"
+ "7zip-min": "^1.4.4"
}
}
diff --git a/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/get.js b/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/get.js
index a24347b4..f02f43c7 100644
--- a/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/get.js
+++ b/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/get.js
@@ -1,10 +1,10 @@
import ExtensionClass from "@classes/extension"
export default async (req) => {
- const { user_id, pkg } = req.params
+ const { user_id, pkg } = req.params
- return await ExtensionClass.resolveManifest({
- user_id,
- pkg,
- })
-}
\ No newline at end of file
+ return await ExtensionClass.resolve({
+ user_id,
+ pkg,
+ })
+}
diff --git a/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/main/get.js b/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/main/get.js
deleted file mode 100644
index 70a190ba..00000000
--- a/packages/server/services/marketplace/routes/extensions/[user_id]/[pkg]/main/get.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import ExtensionClass from "@classes/extension"
-
-export default async (req, res) => {
- const { user_id, pkg } = req.params
-
- const manifest = await ExtensionClass.resolve({
- user_id,
- pkg,
- })
-
- return manifest
-}
\ No newline at end of file
diff --git a/packages/server/services/marketplace/routes/extensions/list/get.js b/packages/server/services/marketplace/routes/extensions/list/get.js
index 679325da..ae6c5cc9 100644
--- a/packages/server/services/marketplace/routes/extensions/list/get.js
+++ b/packages/server/services/marketplace/routes/extensions/list/get.js
@@ -1,7 +1,33 @@
import { Extension } from "@db_models"
export default async (req) => {
- const extensions = await Extension.find()
+ const { limit = 10, offset = 0 } = req.query
- return extensions
+ const totalItems = await Extension.countDocuments()
+
+ const extensions = await Extension.aggregate([
+ {
+ $sort: { registryId: 1, version: -1 },
+ },
+ {
+ $group: {
+ _id: "$registryId",
+ doc: { $first: "$$ROOT" },
+ },
+ },
+ {
+ $replaceRoot: { newRoot: "$doc" },
+ },
+ {
+ $skip: parseInt(offset),
+ },
+ {
+ $limit: parseInt(limit),
+ },
+ ])
+
+ return {
+ items: extensions,
+ total_items: totalItems,
+ }
}
diff --git a/packages/server/services/marketplace/routes/extensions/publish/put.js b/packages/server/services/marketplace/routes/extensions/publish/put.js
index 18337084..e070e038 100644
--- a/packages/server/services/marketplace/routes/extensions/publish/put.js
+++ b/packages/server/services/marketplace/routes/extensions/publish/put.js
@@ -4,47 +4,7 @@ import fs from "node:fs"
import path from "node:path"
import sevenzip from "7zip-min"
-async function uploadFolderToB2(bucketId, folderPath, b2Directory) {
- try {
- const uploadFiles = async (dir) => {
- const files = fs.readdirSync(dir)
-
- for (const file of files) {
- const fullPath = path.join(dir, file)
- const stats = fs.statSync(fullPath)
-
- if (stats.isDirectory()) {
- await uploadFiles(fullPath)
- } else {
- const fileData = fs.readFileSync(fullPath)
- const b2FileName = path
- .join(b2Directory, path.relative(folderPath, fullPath))
- .replace(/\\/g, "/")
-
- console.log(`Uploading ${b2FileName}...`)
-
- const uploadUrl = await b2.getUploadUrl({
- bucketId: bucketId,
- })
-
- await b2.uploadFile({
- uploadUrl: uploadUrl.data.uploadUrl,
- uploadAuthToken: uploadUrl.data.authorizationToken,
- fileName: b2FileName,
- data: fileData,
- })
-
- console.log(`Uploaded ${b2FileName}`)
- }
- }
- }
-
- await uploadFiles(folderPath)
- console.log("All files uploaded successfully.")
- } catch (error) {
- console.error("Error uploading folder:", error)
- }
-}
+import putObject from "@shared-classes/Upload/putObject"
export default {
middlewares: ["withAuthentication"],
@@ -62,7 +22,7 @@ export default {
pkg = JSON.parse(pkg)
const { user_id } = req.auth.session
- const registryId = `${user_id}/${pkg.name}@${pkg.version}`
+ const registryId = `${user_id}/${pkg.name}`
const s3Path = `extensions/${pkg.name}/${pkg.version}`
const workPath = path.resolve(
@@ -84,7 +44,7 @@ export default {
let extensionRegistry = await Extension.findOne({
user_id: user_id,
- registryId: registryId,
+ name: pkg.name,
version: pkg.version,
})
@@ -116,16 +76,20 @@ export default {
})
})
- await uploadFolderToB2(process.env.B2_BUCKET_ID, pkgPath, s3Path)
+ await putObject({
+ filePath: pkgPath,
+ uploadPath: s3Path,
+ })
fs.promises.rm(workPath, { recursive: true, force: true })
- const assetsUrl = `https://${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${s3Path}`
+ const assetsUrl = `${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${s3Path}`
extensionRegistry = await Extension.create({
user_id: user_id,
name: pkg.name,
version: pkg.version,
+ description: pkg.description,
registryId: registryId,
assetsUrl: assetsUrl,
srcUrl: `${assetsUrl}/src`,
diff --git a/packages/server/services/marketplace/utils/b2Upload/index.js b/packages/server/services/marketplace/utils/b2Upload/index.js
deleted file mode 100644
index 82f80239..00000000
--- a/packages/server/services/marketplace/utils/b2Upload/index.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import fs from "node:fs"
-import path from "node:path"
-import pMap from "p-map"
-
-export default async function b2Upload({
- source,
- remotePath,
- metadata = {},
- targetFilename,
- isDirectory,
- retryNumber = 0,
-}) {
- if (isDirectory) {
- let files = await fs.promises.readdir(source)
-
- files = files.map((file) => {
- const filePath = path.join(source, file)
-
- const isTargetDirectory = fs.lstatSync(filePath).isDirectory()
-
- return {
- source: filePath,
- remotePath: path.join(remotePath, file),
- isDirectory: isTargetDirectory,
- }
- })
-
- await pMap(files, b2Upload, {
- concurrency: 5,
- })
-
- return {
- id: remotePath,
- url: `https://${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${remotePath}/${targetFilename}`,
- metadata: metadata,
- }
- }
-
- try {
- //await global.b2.authorize()
-
- if (!fs.existsSync(source)) {
- throw new OperationError(500, "File not found")
- }
-
- const uploadUrl = await global.b2.getUploadUrl({
- bucketId: process.env.B2_BUCKET_ID,
- })
-
- console.debug(`Uploading object to B2 Storage >`, {
- source: source,
- remote: remotePath,
- })
-
- const data = await fs.promises.readFile(source)
-
- await global.b2.uploadFile({
- uploadUrl: uploadUrl.data.uploadUrl,
- uploadAuthToken: uploadUrl.data.authorizationToken,
- fileName: remotePath,
- data: data,
- info: metadata,
- })
- } catch (error) {
- console.error(error)
-
- if (retryNumber < 5) {
- return await b2Upload({
- source,
- remotePath,
- metadata,
- targetFilename,
- isDirectory,
- retryNumber: retryNumber + 1,
- })
- }
-
- throw new OperationError(500, "B2 upload failed")
- }
-
- return {
- id: remotePath,
- url: `https://${process.env.B2_CDN_ENDPOINT}/${process.env.B2_BUCKET}/${remotePath}`,
- metadata: metadata,
- }
-}
diff --git a/packages/server/services/marketplace/utils/syncDirToRemote/index.js b/packages/server/services/marketplace/utils/syncDirToRemote/index.js
deleted file mode 100755
index 7481c2a7..00000000
--- a/packages/server/services/marketplace/utils/syncDirToRemote/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import fs from "fs"
-import path from "path"
-
-async function syncFolder(dir, destPath) {
- const files = await fs.promises.readdir(dir)
-
- for await (const file of files) {
- const filePath = path.resolve(dir, file)
- const desitinationFilePath = `${destPath}/${file}`
-
- const stat = fs.statSync(filePath)
-
- if (stat.isDirectory()) {
- await syncFolder(filePath, desitinationFilePath)
- } else {
- const fileContent = await fs.promises.readFile(filePath)
-
- await global.storage.putObject(process.env.S3_BUCKET, desitinationFilePath, fileContent)
- }
- }
-}
-
-export default syncFolder
\ No newline at end of file
diff --git a/packages/server/services/music/classes/release/index.js b/packages/server/services/music/classes/release/index.js
index d1c10676..b4740bbb 100644
--- a/packages/server/services/music/classes/release/index.js
+++ b/packages/server/services/music/classes/release/index.js
@@ -1,86 +1,144 @@
-import { MusicRelease, User } from "@db_models"
+import { MusicRelease, Track } from "@db_models"
+import TrackClass from "../track"
const AllowedUpdateFields = [
- "title",
- "cover",
- "album",
- "artist",
- "type",
- "public",
- "list",
+ "title",
+ "cover",
+ "album",
+ "artist",
+ "type",
+ "public",
+ "items",
]
export default class Release {
- static async create(payload) {
- console.log(payload)
- if (!payload.title) {
- throw new OperationError(400, "Release title is required")
- }
+ // TODO: implement pagination
+ static async data(id, { user_id = null, limit = 10, offset = 0 } = {}) {
+ let release = await MusicRelease.findOne({
+ _id: id,
+ })
- if (!payload.list) {
- throw new OperationError(400, "Release list is required")
- }
+ if (!release) {
+ throw new OperationError(404, "Release not found")
+ }
- // ensure list is an array of strings with tracks ids only
- payload.list = payload.list.map((item) => {
- if (typeof item !== "string") {
- item = item._id
- }
+ release = release.toObject()
- return item
- })
+ const items = release.items ?? release.list
- const release = new MusicRelease({
- user_id: payload.user_id,
- created_at: Date.now(),
- title: payload.title,
- cover: payload.cover,
- explicit: payload.explicit,
- type: payload.type,
- public: payload.public,
- list: payload.list,
- public: payload.public,
- })
+ const totalTracks = await Track.countDocuments({
+ _id: items,
+ })
- await release.save()
+ const tracks = await TrackClass.get(items, {
+ user_id: user_id,
+ onlyList: true,
+ })
- return release
- }
+ release.total_items = totalTracks
+ release.items = tracks
- static async update(id, payload) {
- let release = await MusicRelease.findById(id).catch((err) => {
- return false
- })
+ return release
+ }
- if (!release) {
- throw new OperationError(404, "Release not found")
- }
+ static async create(payload) {
+ if (!payload.title) {
+ throw new OperationError(400, "Release title is required")
+ }
- if (release.user_id !== payload.user_id) {
- throw new PermissionError(403, "You dont have permission to edit this release")
- }
+ if (!payload.items) {
+ throw new OperationError(400, "Release items is required")
+ }
- for (const field of AllowedUpdateFields) {
- if (payload[field]) {
- release[field] = payload[field]
- }
- }
+ // ensure list is an array of strings with tracks ids only
+ payload.items = payload.items.map((item) => {
+ return item._id ?? item
+ })
- // ensure list is an array of strings with tracks ids only
- release.list = release.list.map((item) => {
- if (typeof item !== "string") {
- item = item._id
- }
+ const release = new MusicRelease({
+ user_id: payload.user_id,
+ created_at: Date.now(),
+ title: payload.title,
+ cover: payload.cover,
+ explicit: payload.explicit,
+ type: payload.type,
+ public: payload.public,
+ items: payload.items,
+ public: payload.public,
+ })
- return item
- })
+ await release.save()
- release = await MusicRelease.findByIdAndUpdate(id, release)
+ return release
+ }
- return release
- }
+ static async update(id, payload) {
+ let release = await MusicRelease.findById(id).catch((err) => {
+ return false
+ })
- static async fullfillItemData(release) {
- return release
- }
-}
\ No newline at end of file
+ if (!release) {
+ throw new OperationError(404, "Release not found")
+ }
+
+ if (release.user_id !== payload.user_id) {
+ throw new PermissionError(
+ 403,
+ "You dont have permission to edit this release",
+ )
+ }
+
+ for (const field of AllowedUpdateFields) {
+ if (typeof payload[field] !== "undefined") {
+ release[field] = payload[field]
+ }
+ }
+
+ // ensure list is an array of strings with tracks ids only
+ release.items = release.items.map((item) => {
+ return item._id ?? item
+ })
+
+ await MusicRelease.findByIdAndUpdate(id, release)
+
+ return release
+ }
+
+ static async delete(id, payload = {}) {
+ let release = await MusicRelease.findById(id).catch((err) => {
+ return false
+ })
+
+ if (!release) {
+ throw new OperationError(404, "Release not found")
+ }
+
+ // check permission
+ if (release.user_id !== payload.user_id) {
+ throw new PermissionError(
+ 403,
+ "You dont have permission to edit this release",
+ )
+ }
+
+ const items = release.items ?? release.list
+
+ const items_ids = items.map((item) => item._id)
+
+ // delete all releated tracks
+ await Track.deleteMany({
+ _id: { $in: items_ids },
+ })
+
+ // delete release
+ await MusicRelease.deleteOne({
+ _id: id,
+ })
+
+ return release
+ }
+
+ static async fullfillItemData(release) {
+ return release
+ }
+}
diff --git a/packages/server/services/music/classes/track/methods/create.js b/packages/server/services/music/classes/track/methods/create.js
index 2faca6aa..86d7daae 100644
--- a/packages/server/services/music/classes/track/methods/create.js
+++ b/packages/server/services/music/classes/track/methods/create.js
@@ -1,58 +1,52 @@
import { Track } from "@db_models"
import requiredFields from "@shared-utils/requiredFields"
-import MusicMetadata from "music-metadata"
-import axios from "axios"
+import * as FFMPEGLib from "@shared-classes/FFMPEGLib"
import ModifyTrack from "./modify"
export default async (payload = {}) => {
- requiredFields(["title", "source", "user_id"], payload)
+ if (typeof payload.title !== "string") {
+ payload.title = undefined
+ }
- let stream = null
- let headers = null
+ if (typeof payload.album !== "string") {
+ payload.album = undefined
+ }
+
+ if (typeof payload.artist !== "string") {
+ payload.artist = undefined
+ }
+
+ if (typeof payload.cover !== "string") {
+ payload.cover = undefined
+ }
+
+ if (typeof payload.source !== "string") {
+ payload.source = undefined
+ }
+
+ if (typeof payload.user_id !== "string") {
+ payload.user_id = undefined
+ }
+
+ requiredFields(["title", "source", "user_id"], payload)
if (typeof payload._id === "string") {
return await ModifyTrack(payload._id, payload)
}
- let metadata = Object()
+ const probe = await FFMPEGLib.Utils.probe(payload.source)
- try {
- const sourceStream = await axios({
- url: payload.source,
- method: "GET",
- responseType: "stream",
- })
-
- stream = sourceStream.data
- headers = sourceStream.headers
-
- const streamMetadata = await MusicMetadata.parseStream(stream, {
- mimeType: headers["content-type"],
- })
-
- metadata = {
- ...metadata,
- format: streamMetadata.format.codec,
- channels: streamMetadata.format.numberOfChannels,
- sampleRate: streamMetadata.format.sampleRate,
- bits: streamMetadata.format.bitsPerSample,
- lossless: streamMetadata.format.lossless,
- duration: streamMetadata.format.duration,
-
- title: streamMetadata.common.title,
- artists: streamMetadata.common.artists,
- album: streamMetadata.common.album,
- }
- } catch (error) {
- // sowy :(
- }
-
- if (typeof payload.metadata === "object") {
- metadata = {
- ...metadata,
- ...payload.metadata,
- }
+ let metadata = {
+ format: probe.streams[0].codec_name,
+ channels: probe.streams[0].channels,
+ bitrate: probe.streams[0].bit_rate ?? probe.format.bit_rate,
+ sampleRate: probe.streams[0].sample_rate,
+ bits:
+ probe.streams[0].bits_per_sample ??
+ probe.streams[0].bits_per_raw_sample,
+ duration: probe.format.duration,
+ tags: probe.format.tags ?? {},
}
if (metadata.format) {
@@ -68,53 +62,28 @@ export default async (payload = {}) => {
}
const obj = {
- title: payload.title,
- album: payload.album,
- cover: payload.cover,
- artists: [],
+ title: payload.title ?? metadata.tags["Title"],
+ album: payload.album ?? metadata.tags["Album"],
+ artist: payload.artist ?? metadata.tags["Artist"],
+ cover:
+ payload.cover ??
+ "https://storage.ragestudio.net/comty-static-assets/default_song.png",
source: payload.source,
metadata: metadata,
- lyrics_enabled: payload.lyrics_enabled,
}
if (Array.isArray(payload.artists)) {
- obj.artists = payload.artists
+ obj.artist = payload.artists.join(", ")
}
- if (typeof payload.artists === "string") {
- obj.artists.push(payload.artists)
- }
+ let track = new Track({
+ ...obj,
+ publisher: {
+ user_id: payload.user_id,
+ },
+ })
- if (typeof payload.artist === "string") {
- obj.artists.push(payload.artist)
- }
+ await track.save()
- if (obj.artists.length === 0 || !obj.artists) {
- obj.artists = metadata.artists
- }
-
- let track = null
-
- if (payload._id) {
- track = await Track.findById(payload._id)
-
- if (!track) {
- throw new OperationError(404, "Track not found, cannot update")
- }
-
- throw new OperationError(501, "Not implemented")
- } else {
- track = new Track({
- ...obj,
- publisher: {
- user_id: payload.user_id,
- },
- })
-
- await track.save()
- }
-
- track = track.toObject()
-
- return track
+ return track.toObject()
}
diff --git a/packages/server/services/music/classes/track/methods/modify.js b/packages/server/services/music/classes/track/methods/modify.js
index d8714f91..ba7eea50 100644
--- a/packages/server/services/music/classes/track/methods/modify.js
+++ b/packages/server/services/music/classes/track/methods/modify.js
@@ -1,25 +1,32 @@
import { Track } from "@db_models"
+const allowedFields = ["title", "artist", "album", "cover"]
+
export default async (track_id, payload) => {
- if (!track_id) {
- throw new OperationError(400, "Missing track_id")
- }
+ if (!track_id) {
+ throw new OperationError(400, "Missing track_id")
+ }
- const track = await Track.findById(track_id)
+ const track = await Track.findById(track_id)
- if (!track) {
- throw new OperationError(404, "Track not found")
- }
+ if (!track) {
+ throw new OperationError(404, "Track not found")
+ }
- if (track.publisher.user_id !== payload.user_id) {
- throw new PermissionError(403, "You dont have permission to edit this track")
- }
+ if (track.publisher.user_id !== payload.user_id) {
+ throw new PermissionError(
+ 403,
+ "You dont have permission to edit this track",
+ )
+ }
- for (const field of Object.keys(payload)) {
- track[field] = payload[field]
- }
+ for (const field of allowedFields) {
+ if (payload[field] !== undefined) {
+ track[field] = payload[field]
+ }
+ }
- track.modified_at = Date.now()
+ track.modified_at = Date.now()
- return await track.save()
-}
\ No newline at end of file
+ return await track.save()
+}
diff --git a/packages/server/services/music/classes/track/methods/toggleFavourite.js b/packages/server/services/music/classes/track/methods/toggleFavourite.js
index 3f60fff9..4c7051a3 100644
--- a/packages/server/services/music/classes/track/methods/toggleFavourite.js
+++ b/packages/server/services/music/classes/track/methods/toggleFavourite.js
@@ -1,62 +1,65 @@
import { Track, TrackLike } from "@db_models"
export default async (user_id, track_id, to) => {
- if (!user_id) {
- throw new OperationError(400, "Missing user_id")
- }
+ if (!user_id) {
+ throw new OperationError(400, "Missing user_id")
+ }
- if (!track_id) {
- throw new OperationError(400, "Missing track_id")
- }
+ if (!track_id) {
+ throw new OperationError(400, "Missing track_id")
+ }
- const track = await Track.findById(track_id)
+ const track = await Track.findById(track_id)
- if (!track) {
- throw new OperationError(404, "Track not found")
- }
+ if (!track) {
+ throw new OperationError(404, "Track not found")
+ }
- let trackLike = await TrackLike.findOne({
- user_id: user_id,
- track_id: track_id,
- }).catch(() => null)
+ let trackLike = await TrackLike.findOne({
+ user_id: user_id,
+ track_id: track_id,
+ }).catch(() => null)
- if (typeof to === "undefined") {
- to = !!!trackLike
- }
+ if (typeof to === "undefined") {
+ to = !!!trackLike
+ }
- if (to) {
- if (!trackLike) {
- trackLike = new TrackLike({
- user_id: user_id,
- track_id: track_id,
- created_at: Date.now(),
- })
+ if (to) {
+ if (!trackLike) {
+ trackLike = new TrackLike({
+ user_id: user_id,
+ track_id: track_id,
+ created_at: Date.now(),
+ })
- await trackLike.save()
- }
- } else {
- if (trackLike) {
- await TrackLike.deleteOne({
- user_id: user_id,
- track_id: track_id,
- })
+ await trackLike.save()
+ }
+ } else {
+ if (trackLike) {
+ await TrackLike.deleteOne({
+ user_id: user_id,
+ track_id: track_id,
+ })
- trackLike = null
- }
- }
+ trackLike = null
+ }
+ }
- const targetSocket = await global.websocket.find.socketByUserId(user_id)
+ if (global.websockets) {
+ const targetSocket =
+ await global.websockets.find.clientsByUserId(user_id)
- if (targetSocket) {
- await targetSocket.emit("music:track:toggle:like", {
- track_id: track_id,
- action: trackLike ? "liked" : "unliked"
- })
- }
+ if (targetSocket) {
+ await targetSocket.emit("music:track:toggle:like", {
+ track_id: track_id,
+ action: trackLike ? "liked" : "unliked",
+ })
+ }
+ }
- return {
- liked: trackLike ? true : false,
- track_like_id: trackLike ? trackLike._id : null,
- track_id: track._id.toString(),
- }
-}
\ No newline at end of file
+ return {
+ liked: trackLike ? true : false,
+ track_like_id: trackLike ? trackLike._id : null,
+ track_id: track._id.toString(),
+ }
+}
diff --git a/packages/server/services/music/music.service.js b/packages/server/services/music/music.service.js
index 4e24f38a..15f1fec2 100755
--- a/packages/server/services/music/music.service.js
+++ b/packages/server/services/music/music.service.js
@@ -2,12 +2,14 @@ import { Server } from "linebridge"
import DbManager from "@shared-classes/DbManager"
import SSEManager from "@shared-classes/SSEManager"
+import RedisClient from "@shared-classes/RedisClient"
import SharedMiddlewares from "@shared-middlewares"
import LimitsClass from "@shared-classes/Limits"
export default class API extends Server {
static refName = "music"
+ static useEngine = "hyper-express-ng"
static enableWebsockets = true
static routesPath = `${__dirname}/routes`
static listen_port = process.env.HTTP_LISTEN_PORT ?? 3003
@@ -19,12 +21,15 @@ export default class API extends Server {
contexts = {
db: new DbManager(),
SSEManager: new SSEManager(),
+ redis: RedisClient(),
}
async onInitialize() {
global.sse = this.contexts.SSEManager
+ global.redis = this.contexts.redis.client
await this.contexts.db.initialize()
+ await this.contexts.redis.initialize()
this.contexts.limits = await LimitsClass.get()
}
diff --git a/packages/server/services/music/package.json b/packages/server/services/music/package.json
index e230c3e0..07e7f330 100755
--- a/packages/server/services/music/package.json
+++ b/packages/server/services/music/package.json
@@ -1,9 +1,3 @@
{
- "name": "music",
- "version": "0.60.2",
- "dependencies": {
- "ms": "^2.1.3",
- "music-metadata": "^7.14.0",
- "openai": "^4.47.2"
- }
+ "name": "music"
}
diff --git a/packages/server/services/music/routes/music/radio/[radio_id]/get.js b/packages/server/services/music/routes/music/radio/[radio_id]/get.js
index 90969443..4fc39c16 100644
--- a/packages/server/services/music/routes/music/radio/[radio_id]/get.js
+++ b/packages/server/services/music/routes/music/radio/[radio_id]/get.js
@@ -1,9 +1,7 @@
export default async (req, res) => {
const radioId = req.params.radio_id
- let redisData = await global.websocket.redis
- .hgetall(`radio-${radioId}`)
- .catch(() => null)
+ let redisData = await redis.hgetall(`radio-${radioId}`).catch(() => null)
return redisData
}
diff --git a/packages/server/services/music/routes/music/radio/list/get.js b/packages/server/services/music/routes/music/radio/list/get.js
index c10a069c..186bf1ed 100644
--- a/packages/server/services/music/routes/music/radio/list/get.js
+++ b/packages/server/services/music/routes/music/radio/list/get.js
@@ -1,19 +1,13 @@
import { RadioProfile } from "@db_models"
async function scanKeysWithPagination(pattern, count = 10, cursor = "0") {
- const result = await global.websocket.redis.scan(
- cursor,
- "MATCH",
- pattern,
- "COUNT",
- count,
- )
+ const result = await redis.scan(cursor, "MATCH", pattern, "COUNT", count)
return result[1]
}
async function getHashData(hashKey) {
- const hashData = await global.websocket.redis.hgetall(hashKey)
+ const hashData = await redis.hgetall(hashKey)
return hashData
}
diff --git a/packages/server/services/music/routes/music/radio/sse/[channel_id]/get.js b/packages/server/services/music/routes/music/radio/sse/[channel_id]/get.js
index 6fc963bb..5e1be783 100644
--- a/packages/server/services/music/routes/music/radio/sse/[channel_id]/get.js
+++ b/packages/server/services/music/routes/music/radio/sse/[channel_id]/get.js
@@ -3,9 +3,7 @@ export default async (req, res) => {
const radioId = channel_id.split("radio:")[1]
- let redisData = await global.websocket.redis
- .hgetall(`radio-${radioId}`)
- .catch(() => null)
+ let redisData = await redis.hgetall(`radio-${radioId}`).catch(() => null)
global.sse.connectToChannelStream(channel_id, req, res, {
initialData: {
diff --git a/packages/server/services/music/routes/music/radio/webhook/post.js b/packages/server/services/music/routes/music/radio/webhook/post.js
index 0a44b1d9..24827732 100644
--- a/packages/server/services/music/routes/music/radio/webhook/post.js
+++ b/packages/server/services/music/routes/music/radio/webhook/post.js
@@ -63,20 +63,17 @@ export default async (req) => {
const redis_id = `radio-${data.radio_id}`
- const existMember = await global.websocket.redis.hexists(
- redis_id,
- "radio_id",
- )
+ const existMember = await redis.hexists(redis_id, "radio_id")
if (data.online) {
- await global.websocket.redis.hset(redis_id, {
+ await redis.hset(redis_id, {
...data,
now_playing: JSON.stringify(data.now_playing),
})
}
if (!data.online && existMember) {
- await global.websocket.redis.hdel(redis_id)
+ await redis.hdel(redis_id)
}
console.log(`[${data.radio_id}] Updating radio data`)
@@ -85,7 +82,6 @@ export default async (req) => {
event: "update",
data: data,
})
- global.websocket.io.to(`radio:${data.radio_id}`).emit(`update`, data)
return data
}
diff --git a/packages/server/services/music/routes/music/releases/[release_id]/data/get.js b/packages/server/services/music/routes/music/releases/[release_id]/data/get.js
index 257daebc..4e0caca5 100644
--- a/packages/server/services/music/routes/music/releases/[release_id]/data/get.js
+++ b/packages/server/services/music/routes/music/releases/[release_id]/data/get.js
@@ -1,5 +1,4 @@
-import { MusicRelease, Track } from "@db_models"
-import TrackClass from "@classes/track"
+import ReleaseClass from "@classes/release"
export default {
middlewares: ["withOptionalAuthentication"],
@@ -7,29 +6,10 @@ export default {
const { release_id } = req.params
const { limit = 50, offset = 0 } = req.query
- let release = await MusicRelease.findOne({
- _id: release_id,
- })
-
- if (!release) {
- throw new OperationError(404, "Release not found")
- }
-
- release = release.toObject()
-
- const totalTracks = await Track.countDocuments({
- _id: release.list,
- })
-
- const tracks = await TrackClass.get(release.list, {
+ return await ReleaseClass.data(release_id, {
user_id: req.auth?.session?.user_id,
- onlyList: true,
+ limit,
+ offset,
})
-
- release.listLength = totalTracks
- release.items = tracks
- release.list = tracks
-
- return release
},
}
diff --git a/packages/server/services/music/routes/music/releases/[release_id]/delete.js b/packages/server/services/music/routes/music/releases/[release_id]/delete.js
index 4b7adb5b..30a40b86 100644
--- a/packages/server/services/music/routes/music/releases/[release_id]/delete.js
+++ b/packages/server/services/music/routes/music/releases/[release_id]/delete.js
@@ -1,26 +1,10 @@
-import { MusicRelease, Track } from "@db_models"
+import ReleaseClass from "@classes/release"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- const { release_id } = req.params
-
- let release = await MusicRelease.findOne({
- _id: release_id
- })
-
- if (!release) {
- throw new OperationError(404, "Release not found")
- }
-
- if (release.user_id !== req.auth.session.user_id) {
- throw new OperationError(403, "Unauthorized")
- }
-
- await MusicRelease.deleteOne({
- _id: release_id
- })
-
- return release
- }
-}
\ No newline at end of file
+ middlewares: ["withAuthentication"],
+ fn: async (req) => {
+ return await ReleaseClass.delete(req.params.release_id, {
+ user_id: req.auth.session.user_id,
+ })
+ },
+}
diff --git a/packages/server/services/music/routes/music/releases/self/get.js b/packages/server/services/music/routes/music/releases/self/get.js
index 55eacba2..4c696b69 100644
--- a/packages/server/services/music/routes/music/releases/self/get.js
+++ b/packages/server/services/music/routes/music/releases/self/get.js
@@ -29,7 +29,7 @@ export default {
if (req.query.resolveItemsData === "true") {
releases = await Promise.all(
playlists.map(async (playlist) => {
- playlist.items = await Track.find({
+ playlist.list = await Track.find({
_id: [...playlist.list],
})
@@ -39,7 +39,7 @@ export default {
}
return {
- total_length: await MusicRelease.countDocuments(searchQuery),
+ total_items: await MusicRelease.countDocuments(searchQuery),
items: releases,
}
},
diff --git a/packages/server/services/music/routes/music/tracks/put.js b/packages/server/services/music/routes/music/tracks/put.js
index d7720e47..415bb16a 100644
--- a/packages/server/services/music/routes/music/tracks/put.js
+++ b/packages/server/services/music/routes/music/tracks/put.js
@@ -2,36 +2,36 @@ import requiredFields from "@shared-utils/requiredFields"
import TrackClass from "@classes/track"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- if (Array.isArray(req.body.list)) {
- let results = []
+ middlewares: ["withAuthentication"],
+ fn: async (req) => {
+ if (Array.isArray(req.body.items)) {
+ let results = []
- for await (const item of req.body.list) {
- if (!item.source || !item.title) {
- continue
- }
+ for await (const item of req.body.items) {
+ if (!item.source || !item.title) {
+ continue
+ }
- const track = await TrackClass.create({
- ...item,
- user_id: req.auth.session.user_id,
- })
+ const track = await TrackClass.create({
+ ...item,
+ user_id: req.auth.session.user_id,
+ })
- results.push(track)
- }
+ results.push(track)
+ }
- return {
- list: results
- }
- }
+ return {
+ items: results,
+ }
+ }
- requiredFields(["title", "source"], req.body)
+ requiredFields(["title", "source"], req.body)
- const track = await TrackClass.create({
- ...req.body,
- user_id: req.auth.session.user_id,
- })
+ const track = await TrackClass.create({
+ ...req.body,
+ user_id: req.auth.session.user_id,
+ })
- return track
- }
-}
\ No newline at end of file
+ return track
+ },
+}
diff --git a/packages/server/services/notifications/package.json b/packages/server/services/notifications/package.json
index b4692cff..71499320 100644
--- a/packages/server/services/notifications/package.json
+++ b/packages/server/services/notifications/package.json
@@ -1,4 +1,3 @@
{
- "name": "notifications",
- "version": "1.0.0"
+ "name": "notifications"
}
diff --git a/packages/server/services/posts/classes/posts/methods/create.js b/packages/server/services/posts/classes/posts/methods/create.js
index 0b91c36f..a469a177 100644
--- a/packages/server/services/posts/classes/posts/methods/create.js
+++ b/packages/server/services/posts/classes/posts/methods/create.js
@@ -89,11 +89,15 @@ export default async (payload = {}, req) => {
// broadcast post to all users
if (visibility === "public") {
- global.websocket.senders.toTopic("realtime:feed", "post:new", result[0])
+ global.websockets.senders.toTopic(
+ "realtime:feed",
+ "post:new",
+ result[0],
+ )
}
if (visibility === "private") {
- const userSockets = await global.websocket.find.clientsByUserId(
+ const userSockets = await global.websockets.find.clientsByUserId(
post.user_id,
)
diff --git a/packages/server/services/posts/classes/posts/methods/data.js b/packages/server/services/posts/classes/posts/methods/data.js
index dbbc158b..97c6e590 100644
--- a/packages/server/services/posts/classes/posts/methods/data.js
+++ b/packages/server/services/posts/classes/posts/methods/data.js
@@ -8,8 +8,8 @@ export default async (payload = {}) => {
for_user_id,
post_id,
query = {},
- trim = 0,
limit = 20,
+ page = 0,
sort = { created_at: -1 },
} = payload
@@ -31,8 +31,8 @@ export default async (payload = {}) => {
} else {
posts = await Post.find({ ...query })
.sort(sort)
- .skip(trim)
.limit(limit)
+ .skip(limit * page)
}
// fullfill data
diff --git a/packages/server/services/posts/classes/posts/methods/delete.js b/packages/server/services/posts/classes/posts/methods/delete.js
index 4895be6f..246b166c 100644
--- a/packages/server/services/posts/classes/posts/methods/delete.js
+++ b/packages/server/services/posts/classes/posts/methods/delete.js
@@ -42,7 +42,7 @@ export default async (payload = {}) => {
// broadcast post to all users
if (post.visibility === "public") {
- global.websocket.senders.toTopic(
+ global.websockets.senders.toTopic(
"realtime:feed",
"post:delete",
post_id,
@@ -50,7 +50,7 @@ export default async (payload = {}) => {
}
if (post.visibility === "private") {
- const userSockets = await global.websocket.find.clientsByUserId(
+ const userSockets = await global.websockets.find.clientsByUserId(
post.user_id,
)
diff --git a/packages/server/services/posts/classes/posts/methods/deletePollVote.js b/packages/server/services/posts/classes/posts/methods/deletePollVote.js
index 05125a2c..182a80f4 100644
--- a/packages/server/services/posts/classes/posts/methods/deletePollVote.js
+++ b/packages/server/services/posts/classes/posts/methods/deletePollVote.js
@@ -1,33 +1,33 @@
import { VotePoll } from "@db_models"
export default async (payload = {}) => {
- if (!payload.user_id) {
- throw new OperationError(400, "Missing user_id")
- }
+ if (!payload.user_id) {
+ throw new OperationError(400, "Missing user_id")
+ }
- if (!payload.post_id) {
- throw new OperationError(400, "Missing post_id")
- }
+ if (!payload.post_id) {
+ throw new OperationError(400, "Missing post_id")
+ }
- if (!payload.option_id) {
- throw new OperationError(400, "Missing option_id")
- }
+ if (!payload.option_id) {
+ throw new OperationError(400, "Missing option_id")
+ }
- let vote = await VotePoll.find({
- user_id: payload.user_id,
- post_id: payload.post_id,
- option_id: payload.option_id,
- })
+ let vote = await VotePoll.find({
+ user_id: payload.user_id,
+ post_id: payload.post_id,
+ option_id: payload.option_id,
+ })
- if (!vote) {
- throw new OperationError(404, "Poll vote not found")
- }
+ if (!vote) {
+ throw new OperationError(404, "Poll vote not found")
+ }
- await VotePoll.deleteOne({
- _id: vote._id
- })
+ await VotePoll.deleteOne({
+ _id: vote._id,
+ })
- global.websocket.io.of("/").emit(`post.poll.vote.deleted`, vote)
+ global.websockets.io.of("/").emit(`post.poll.vote.deleted`, vote)
- return vote
-}
\ No newline at end of file
+ return vote
+}
diff --git a/packages/server/services/posts/classes/posts/methods/fromUserId.js b/packages/server/services/posts/classes/posts/methods/fromUserId.js
index 38f5c731..1b00b60e 100644
--- a/packages/server/services/posts/classes/posts/methods/fromUserId.js
+++ b/packages/server/services/posts/classes/posts/methods/fromUserId.js
@@ -1,25 +1,20 @@
import GetData from "./data"
export default async (payload = {}) => {
- const {
- for_user_id,
- user_id,
- trim,
- limit,
- } = payload
+ const { for_user_id, user_id, page, limit } = payload
- if (!user_id) {
- throw new OperationError(400, "Missing user_id")
- }
+ if (!user_id) {
+ throw new OperationError(400, "Missing user_id")
+ }
- return await GetData({
- for_user_id: for_user_id,
- trim: trim,
- limit: limit,
- query: {
- user_id: {
- $in: user_id
- }
- }
- })
-}
\ No newline at end of file
+ return await GetData({
+ for_user_id: for_user_id,
+ page: page,
+ limit: limit,
+ query: {
+ user_id: {
+ $in: user_id,
+ },
+ },
+ })
+}
diff --git a/packages/server/services/posts/classes/posts/methods/getLiked.js b/packages/server/services/posts/classes/posts/methods/getLiked.js
index 84ed4a6a..e443348b 100644
--- a/packages/server/services/posts/classes/posts/methods/getLiked.js
+++ b/packages/server/services/posts/classes/posts/methods/getLiked.js
@@ -2,25 +2,24 @@ import { PostLike } from "@db_models"
import GetData from "./data"
export default async (payload = {}) => {
- let { user_id, trim, limit } = payload
+ let { user_id, page, limit } = payload
- if (!user_id) {
- throw new OperationError(400, "Missing user_id")
- }
+ if (!user_id) {
+ throw new OperationError(400, "Missing user_id")
+ }
- let ids = await PostLike.find({ user_id })
+ let ids = await PostLike.find({ user_id })
- ids = ids.map((item) => item.post_id)
+ ids = ids.map((item) => item.post_id)
- return await GetData({
- trim: trim,
- limit: limit,
- for_user_id: user_id,
- query: {
- _id: {
- $in: ids
- }
- }
- })
+ return await GetData({
+ page: page,
+ limit: limit,
+ for_user_id: user_id,
+ query: {
+ _id: {
+ $in: ids,
+ },
+ },
+ })
}
-
diff --git a/packages/server/services/posts/classes/posts/methods/getSaved.js b/packages/server/services/posts/classes/posts/methods/getSaved.js
index e3697df1..56f79bc2 100644
--- a/packages/server/services/posts/classes/posts/methods/getSaved.js
+++ b/packages/server/services/posts/classes/posts/methods/getSaved.js
@@ -2,28 +2,28 @@ import { PostSave } from "@db_models"
import GetData from "./data"
export default async (payload = {}) => {
- let { user_id, trim, limit } = payload
+ let { user_id, page, limit } = payload
- if (!user_id) {
- throw new OperationError(400, "Missing user_id")
- }
+ if (!user_id) {
+ throw new OperationError(400, "Missing user_id")
+ }
- let ids = await PostSave.find({ user_id })
+ let ids = await PostSave.find({ user_id })
- if (ids.length === 0) {
- return []
- }
+ if (ids.length === 0) {
+ return []
+ }
- ids = ids.map((item) => item.post_id)
+ ids = ids.map((item) => item.post_id)
- return await GetData({
- trim: trim,
- limit: limit,
- for_user_id: user_id,
- query: {
- _id: {
- $in: ids
- }
- }
- })
-}
\ No newline at end of file
+ return await GetData({
+ page: page,
+ limit: limit,
+ for_user_id: user_id,
+ query: {
+ _id: {
+ $in: ids,
+ },
+ },
+ })
+}
diff --git a/packages/server/services/posts/classes/posts/methods/globalTimeline.js b/packages/server/services/posts/classes/posts/methods/globalTimeline.js
index e08fd6af..31af49cc 100644
--- a/packages/server/services/posts/classes/posts/methods/globalTimeline.js
+++ b/packages/server/services/posts/classes/posts/methods/globalTimeline.js
@@ -1,17 +1,7 @@
import GetPostData from "./data"
export default async (payload = {}) => {
- let {
- user_id,
- trim,
- limit,
- } = payload
+ const posts = await GetPostData(payload)
- const posts = await GetPostData({
- for_user_id: user_id,
- trim,
- limit,
- })
-
- return posts
-}
\ No newline at end of file
+ return posts
+}
diff --git a/packages/server/services/posts/classes/posts/methods/replies.js b/packages/server/services/posts/classes/posts/methods/replies.js
index d245d2a7..b7a9fe95 100644
--- a/packages/server/services/posts/classes/posts/methods/replies.js
+++ b/packages/server/services/posts/classes/posts/methods/replies.js
@@ -2,7 +2,7 @@ import { Post } from "@db_models"
import stage from "./stage"
export default async (payload = {}) => {
- const { post_id, for_user_id, trim = 0, limit = 50 } = payload
+ const { post_id, for_user_id, page = 0, limit = 50 } = payload
if (!post_id) {
throw new OperationError(400, "Post ID is required")
@@ -12,7 +12,7 @@ export default async (payload = {}) => {
reply_to: post_id,
})
.limit(limit)
- .skip(trim)
+ .skip(limit * page)
.sort({ created_at: -1 })
posts = await stage({
diff --git a/packages/server/services/posts/classes/posts/methods/timeline.js b/packages/server/services/posts/classes/posts/methods/timeline.js
index 30702f61..9be97801 100644
--- a/packages/server/services/posts/classes/posts/methods/timeline.js
+++ b/packages/server/services/posts/classes/posts/methods/timeline.js
@@ -3,41 +3,32 @@ import { UserFollow } from "@db_models"
import GetPostData from "./data"
export default async (payload = {}) => {
- let {
- user_id,
- trim,
- limit,
- } = payload
+ payload.query = {}
- let query = {}
+ //TODO: include posts from groups
+ //TODO: include promotional posts
+ if (payload.for_user_id) {
+ const from_users = []
- //TODO: include posts from groups
- //TODO: include promotional posts
- if (user_id) {
- const from_users = []
+ from_users.push(payload.for_user_id)
- from_users.push(user_id)
+ // get post from users that the user follows
+ const followingUsers = await UserFollow.find({
+ user_id: payload.for_user_id,
+ })
- // get post from users that the user follows
- const followingUsers = await UserFollow.find({
- user_id: user_id
- })
+ const followingUserIds = followingUsers.map(
+ (followingUser) => followingUser.to,
+ )
- const followingUserIds = followingUsers.map((followingUser) => followingUser.to)
+ from_users.push(...followingUserIds)
- from_users.push(...followingUserIds)
+ payload.query.user_id = {
+ $in: from_users,
+ }
+ }
- query.user_id = {
- $in: from_users
- }
- }
+ const posts = await GetPostData(payload)
- const posts = await GetPostData({
- for_user_id: user_id,
- trim,
- limit,
- query: query,
- })
-
- return posts
-}
\ No newline at end of file
+ return posts
+}
diff --git a/packages/server/services/posts/classes/posts/methods/update.js b/packages/server/services/posts/classes/posts/methods/update.js
index 26e3b891..ccb94b31 100644
--- a/packages/server/services/posts/classes/posts/methods/update.js
+++ b/packages/server/services/posts/classes/posts/methods/update.js
@@ -37,7 +37,7 @@ export default async (post_id, update) => {
})
if (post.visibility === "public") {
- global.websocket.senders.toTopic(
+ global.websockets.senders.toTopic(
"realtime:feed",
`post:update`,
result[0],
@@ -45,7 +45,7 @@ export default async (post_id, update) => {
}
if (post.visibility === "private") {
- const userSockets = await global.websocket.find.clientsByUserId(
+ const userSockets = await global.websockets.find.clientsByUserId(
post.user_id,
)
diff --git a/packages/server/services/posts/classes/posts/methods/votePoll.js b/packages/server/services/posts/classes/posts/methods/votePoll.js
index 61290fcc..6660e721 100644
--- a/packages/server/services/posts/classes/posts/methods/votePoll.js
+++ b/packages/server/services/posts/classes/posts/methods/votePoll.js
@@ -51,7 +51,7 @@ export default async (payload = {}) => {
post = (await stage({ posts: post, for_user_id: payload.user_id }))[0]
if (post.visibility === "public") {
- global.websocket.senders.toTopic("realtime:feed", `post:update`, post)
+ global.websockets.senders.toTopic("realtime:feed", `post:update`, post)
}
return {
diff --git a/packages/server/services/posts/package.json b/packages/server/services/posts/package.json
index 56952f06..925e670e 100644
--- a/packages/server/services/posts/package.json
+++ b/packages/server/services/posts/package.json
@@ -1,7 +1,7 @@
{
- "name": "posts",
- "version": "1.0.0",
- "dependencies": {
- "moment-timezone": "^0.5.45"
- }
+ "name": "posts",
+ "dependencies": {
+ "linebridge": "^1.0.0-a3",
+ "moment-timezone": "^0.5.45"
+ }
}
diff --git a/packages/server/services/posts/posts.service.js b/packages/server/services/posts/posts.service.js
index 90e9ae25..1a226219 100644
--- a/packages/server/services/posts/posts.service.js
+++ b/packages/server/services/posts/posts.service.js
@@ -10,10 +10,10 @@ import SharedMiddlewares from "@shared-middlewares"
export default class API extends Server {
static refName = "posts"
- static useEngine = "hyper-express-ng"
- static enableWebsockets = true
-
- static listen_port = process.env.HTTP_LISTEN_PORT ?? 3001
+ static websockets = true
+ static listenPort = process.env.HTTP_LISTEN_PORT ?? 3001
+ static useMiddlewares = ["logs"]
+ static bypassCors = true
middlewares = {
...SharedMiddlewares,
diff --git a/packages/server/services/posts/routes/posts/[post_id]/data/get.js b/packages/server/services/posts/routes/posts/[post_id]/data/get.js
index 760b6b82..43e6e4bd 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/data/get.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/data/get.js
@@ -1,13 +1,13 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withOptionalAuthentication"],
- fn: async (req, res) => {
- const result = await Posts.data({
- post_id: req.params.post_id,
- for_user_id: req.auth?.session?.user_id,
- })
+ useMiddlewares: ["withOptionalAuthentication"],
+ fn: async (req, res) => {
+ const result = await Posts.data({
+ post_id: req.params.post_id,
+ for_user_id: req.auth?.session?.user_id,
+ })
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/delete.js b/packages/server/services/posts/routes/posts/[post_id]/delete.js
index fe1315c5..968933e8 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/delete.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/delete.js
@@ -1,27 +1,28 @@
import PostClass from "@classes/posts"
import { Post } from "@db_models"
+
export default {
- middlewares: ["withAuthentication"],
- fn: async (req, res) => {
- // check if post is owned or if is admin
- const post = await Post.findById(req.params.post_id).catch(() => {
- return false
- })
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req, res) => {
+ // check if post is owned or if is admin
+ const post = await Post.findById(req.params.post_id).catch(() => {
+ return false
+ })
- if (!post) {
- throw new OperationError(404, "Post not found")
- }
+ if (!post) {
+ throw new OperationError(404, "Post not found")
+ }
- const user = await req.auth.user()
+ const user = await req.auth.user()
- if (post.user_id.toString() !== user._id.toString()) {
- if (!user.roles.includes("admin")) {
- throw new OperationError(403, "You cannot delete this post")
- }
- }
+ if (post.user_id.toString() !== user._id.toString()) {
+ if (!user.roles.includes("admin")) {
+ throw new OperationError(403, "You cannot delete this post")
+ }
+ }
- return await PostClass.delete({
- post_id: req.params.post_id
- })
- }
-}
\ No newline at end of file
+ return await PostClass.delete({
+ post_id: req.params.post_id,
+ })
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/replies/get.js b/packages/server/services/posts/routes/posts/[post_id]/replies/get.js
index 059837e5..1464df63 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/replies/get.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/replies/get.js
@@ -1,13 +1,13 @@
import PostClass from "@classes/posts"
export default {
- middlewares: ["withOptionalAuthentication"],
- fn: async (req) => {
- return await PostClass.replies({
- post_id: req.params.post_id,
- for_user_id: req.auth?.session.user_id,
- trim: req.query.trim,
- limit: req.query.limit
- })
- }
-}
\ No newline at end of file
+ useMiddlewares: ["withOptionalAuthentication"],
+ fn: async (req) => {
+ return await PostClass.replies({
+ post_id: req.params.post_id,
+ for_user_id: req.auth?.session.user_id,
+ trim: req.query.trim,
+ limit: req.query.limit,
+ })
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/toggle_like/post.js b/packages/server/services/posts/routes/posts/[post_id]/toggle_like/post.js
index 5b80505f..ec766a59 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/toggle_like/post.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/toggle_like/post.js
@@ -1,14 +1,14 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req, res) => {
- const result = await Posts.toggleLike({
- post_id: req.params.post_id,
- user_id: req.auth.session.user_id,
- to: req.body?.to,
- })
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req, res) => {
+ const result = await Posts.toggleLike({
+ post_id: req.params.post_id,
+ user_id: req.auth.session.user_id,
+ to: req.body?.to,
+ })
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/toggle_save/post.js b/packages/server/services/posts/routes/posts/[post_id]/toggle_save/post.js
index 2bf106f7..84692f10 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/toggle_save/post.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/toggle_save/post.js
@@ -1,14 +1,14 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req, res) => {
- const result = await Posts.toggleSave({
- post_id: req.params.post_id,
- user_id: req.auth.session.user_id,
- to: req.body?.to,
- })
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req, res) => {
+ const result = await Posts.toggleSave({
+ post_id: req.params.post_id,
+ user_id: req.auth.session.user_id,
+ to: req.body?.to,
+ })
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/update/put.js b/packages/server/services/posts/routes/posts/[post_id]/update/put.js
index 1cdd9439..c8449589 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/update/put.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/update/put.js
@@ -15,7 +15,7 @@ const MaxStringsLengths = {
}
export default {
- middlewares: ["withAuthentication"],
+ useMiddlewares: ["withAuthentication"],
fn: async (req) => {
let update = {}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/delete.js b/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/delete.js
index 0f70d3a6..73d02493 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/delete.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/delete.js
@@ -1,14 +1,14 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- const result = await Posts.deleteVotePoll({
- user_id: req.auth.session.user_id,
- post_id: req.params.post_id,
- option_id: req.params.option_id,
- })
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req) => {
+ const result = await Posts.deleteVotePoll({
+ user_id: req.auth.session.user_id,
+ post_id: req.params.post_id,
+ option_id: req.params.option_id,
+ })
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/post.js b/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/post.js
index f4fe61ac..c53495dc 100644
--- a/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/post.js
+++ b/packages/server/services/posts/routes/posts/[post_id]/vote_poll/[option_id]/post.js
@@ -1,14 +1,14 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- const result = await Posts.votePoll({
- user_id: req.auth.session.user_id,
- post_id: req.params.post_id,
- option_id: req.params.option_id,
- })
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req) => {
+ const result = await Posts.votePoll({
+ user_id: req.auth.session.user_id,
+ post_id: req.params.post_id,
+ option_id: req.params.option_id,
+ })
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/feed/global/get.js b/packages/server/services/posts/routes/posts/feed/global/get.js
index 102eec4a..6a1afaa3 100644
--- a/packages/server/services/posts/routes/posts/feed/global/get.js
+++ b/packages/server/services/posts/routes/posts/feed/global/get.js
@@ -1,19 +1,19 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withOptionalAuthentication"],
- fn: async (req, res) => {
- const payload = {
- limit: req.query?.limit,
- trim: req.query?.trim,
- }
+ useMiddlewares: ["withOptionalAuthentication"],
+ fn: async (req, res) => {
+ const payload = {
+ limit: req.query?.limit,
+ page: req.query?.page,
+ }
- if (req.auth) {
- payload.user_id = req.auth.session.user_id
- }
+ if (req.auth) {
+ payload.for_user_id = req.auth.session.user_id
+ }
- const result = await Posts.globalTimeline(payload)
+ const result = await Posts.globalTimeline(payload)
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/feed/timeline/get.js b/packages/server/services/posts/routes/posts/feed/timeline/get.js
index a5bfaa19..a6ea2cf0 100644
--- a/packages/server/services/posts/routes/posts/feed/timeline/get.js
+++ b/packages/server/services/posts/routes/posts/feed/timeline/get.js
@@ -1,19 +1,19 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withOptionalAuthentication"],
- fn: async (req, res) => {
- const payload = {
- limit: req.query?.limit,
- trim: req.query?.trim,
- }
+ useMiddlewares: ["withOptionalAuthentication"],
+ fn: async (req, res) => {
+ const payload = {
+ limit: req.query?.limit,
+ page: req.query?.page,
+ }
- if (req.auth) {
- payload.user_id = req.auth.session.user_id
- }
+ if (req.auth) {
+ payload.for_user_id = req.auth.session.user_id
+ }
- const result = await Posts.timeline(payload)
+ const result = await Posts.timeline(payload)
- return result
- }
-}
\ No newline at end of file
+ return result
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/liked/get.js b/packages/server/services/posts/routes/posts/liked/get.js
index e70c49c3..e4904ee7 100644
--- a/packages/server/services/posts/routes/posts/liked/get.js
+++ b/packages/server/services/posts/routes/posts/liked/get.js
@@ -1,12 +1,12 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- return await Posts.getLiked({
- trim: req.query.trim,
- limit: req.query.limit,
- user_id: req.auth.session.user_id
- })
- }
-}
\ No newline at end of file
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req) => {
+ return await Posts.getLiked({
+ page: req.query.page,
+ limit: req.query.limit,
+ user_id: req.auth.session.user_id,
+ })
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/new/post.js b/packages/server/services/posts/routes/posts/new/post.js
index 24739265..bb6357c2 100644
--- a/packages/server/services/posts/routes/posts/new/post.js
+++ b/packages/server/services/posts/routes/posts/new/post.js
@@ -1,7 +1,7 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
+ useMiddlewares: ["withAuthentication"],
fn: async (req, res) => {
const result = await Posts.create(
{
diff --git a/packages/server/services/posts/routes/posts/saved/get.js b/packages/server/services/posts/routes/posts/saved/get.js
index 02391afe..2aa85390 100644
--- a/packages/server/services/posts/routes/posts/saved/get.js
+++ b/packages/server/services/posts/routes/posts/saved/get.js
@@ -1,12 +1,12 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withAuthentication"],
- fn: async (req) => {
- return await Posts.getSaved({
- trim: req.query.trim,
- limit: req.query.limit,
- user_id: req.auth.session.user_id
- })
- }
-}
\ No newline at end of file
+ useMiddlewares: ["withAuthentication"],
+ fn: async (req) => {
+ return await Posts.getSaved({
+ page: req.query.page,
+ limit: req.query.limit,
+ user_id: req.auth.session.user_id,
+ })
+ },
+}
diff --git a/packages/server/services/posts/routes/posts/trending/[trending]/get.js b/packages/server/services/posts/routes/posts/trending/[trending]/get.js
index 753b9302..a6836da6 100644
--- a/packages/server/services/posts/routes/posts/trending/[trending]/get.js
+++ b/packages/server/services/posts/routes/posts/trending/[trending]/get.js
@@ -2,7 +2,7 @@ import { Post } from "@db_models"
import stage from "@classes/posts/methods/stage"
export default {
- middlewares: ["withOptionalAuthentication"],
+ useMiddlewares: ["withOptionalAuthentication"],
fn: async (req) => {
const { limit, trim } = req.query
diff --git a/packages/server/services/posts/routes/posts/trendings/get.js b/packages/server/services/posts/routes/posts/trendings/get.js
index 1301f38b..b8b76ee7 100644
--- a/packages/server/services/posts/routes/posts/trendings/get.js
+++ b/packages/server/services/posts/routes/posts/trendings/get.js
@@ -5,41 +5,41 @@ const maxDaysOld = 30
const maxHashtags = 5
export default async (req) => {
- // fetch all posts that contain in message an #, with a maximun of 5 diferent hashtags
- const startDate = DateTime.local().minus({ days: maxDaysOld }).toISO()
+ // fetch all posts that contain in message an #, with a maximun of 5 diferent hashtags
+ const startDate = DateTime.local().minus({ days: maxDaysOld }).toISO()
- const trendings = await Post.aggregate([
- {
- $match: {
- message: { $regex: /#/gi },
- created_at: { $gte: startDate }
- }
- },
- {
- $project: {
- hashtags: {
- $regexFindAll: {
- input: "$message",
- regex: /#[a-zA-Z0-9_]+/g
- }
- }
- }
- },
- { $unwind: "$hashtags" },
- {
- $project: {
- hashtag: { $substr: ["$hashtags.match", 1, -1] }
- }
- },
- {
- $group: {
- _id: "$hashtag",
- count: { $sum: 1 }
- }
- },
- { $sort: { count: -1 } },
- { $limit: maxHashtags }
- ])
+ const trendings = await Post.aggregate([
+ {
+ $match: {
+ message: { $regex: /#/gi },
+ created_at: { $gte: startDate },
+ },
+ },
+ {
+ $project: {
+ hashtags: {
+ $regexFindAll: {
+ input: "$message",
+ regex: /#[a-zA-Z0-9_]+/g,
+ },
+ },
+ },
+ },
+ { $unwind: "$hashtags" },
+ {
+ $project: {
+ hashtag: { $substr: ["$hashtags.match", 1, -1] },
+ },
+ },
+ {
+ $group: {
+ _id: "$hashtag",
+ count: { $sum: 1 },
+ },
+ },
+ { $sort: { count: -1 } },
+ { $limit: maxHashtags },
+ ])
- return trendings.map(({ _id, count }) => ({ hashtag: _id, count }));
-}
\ No newline at end of file
+ return trendings.map(({ _id, count }) => ({ hashtag: _id, count }))
+}
diff --git a/packages/server/services/posts/routes/posts/user/[user_id]/get.js b/packages/server/services/posts/routes/posts/user/[user_id]/get.js
index 61c102ec..ed282b46 100644
--- a/packages/server/services/posts/routes/posts/user/[user_id]/get.js
+++ b/packages/server/services/posts/routes/posts/user/[user_id]/get.js
@@ -1,13 +1,13 @@
import Posts from "@classes/posts"
export default {
- middlewares: ["withOptionalAuthentication"],
- fn: async (req, res) => {
- return await Posts.fromUserId({
- skip: req.query.skip,
- trim: req.query.trim,
- user_id: req.params.user_id,
- for_user_id: req.auth?.session?.user_id,
- })
- }
-}
\ No newline at end of file
+ useMiddlewares: ["withOptionalAuthentication"],
+ fn: async (req, res) => {
+ return await Posts.fromUserId({
+ limit: req.query.limit,
+ page: req.query.page,
+ user_id: req.params.user_id,
+ for_user_id: req.auth?.session?.user_id,
+ })
+ },
+}
diff --git a/packages/server/services/search/package.json b/packages/server/services/search/package.json
index 4373c84f..68b82853 100644
--- a/packages/server/services/search/package.json
+++ b/packages/server/services/search/package.json
@@ -1,6 +1,3 @@
{
- "name": "search",
- "version": "1.0.0",
- "main": "index.js",
- "license": "MIT"
+ "name": "search"
}
diff --git a/packages/server/services/search/search.service.js b/packages/server/services/search/search.service.js
index de54af63..109161b8 100644
--- a/packages/server/services/search/search.service.js
+++ b/packages/server/services/search/search.service.js
@@ -6,24 +6,23 @@ import RedisClient from "@shared-classes/RedisClient"
import SharedMiddlewares from "@shared-middlewares"
class API extends Server {
- static refName = "search"
- static wsRoutesPath = `${__dirname}/ws_routes`
- static routesPath = `${__dirname}/routes`
- static listen_port = process.env.HTTP_LISTEN_PORT ?? 3010
+ static refName = "search"
+ static routesPath = `${__dirname}/routes`
+ static listen_port = process.env.HTTP_LISTEN_PORT ?? 3010
- middlewares = {
- ...SharedMiddlewares
- }
+ middlewares = {
+ ...SharedMiddlewares,
+ }
- contexts = {
- db: new DbManager(),
- redis: RedisClient(),
- }
+ contexts = {
+ db: new DbManager(),
+ redis: RedisClient(),
+ }
- async onInitialize() {
- await this.contexts.db.initialize()
- await this.contexts.redis.initialize()
- }
+ async onInitialize() {
+ await this.contexts.db.initialize()
+ await this.contexts.redis.initialize()
+ }
}
-Boot(API)
\ No newline at end of file
+Boot(API)
diff --git a/packages/server/services/users/users.service.js b/packages/server/services/users/users.service.js
index 38acde4f..3c58eee8 100644
--- a/packages/server/services/users/users.service.js
+++ b/packages/server/services/users/users.service.js
@@ -6,26 +6,24 @@ import RedisClient from "@shared-classes/RedisClient"
import SharedMiddlewares from "@shared-middlewares"
export default class API extends Server {
- static refName = "users"
- static useEngine = "hyper-express"
- static routesPath = `${__dirname}/routes`
- static listen_port = process.env.HTTP_LISTEN_PORT ?? 3008
+ static refName = "users"
+ static useEngine = "hyper-express"
+ static routesPath = `${__dirname}/routes`
+ static listen_port = process.env.HTTP_LISTEN_PORT ?? 3008
- middlewares = {
- ...SharedMiddlewares
- }
+ middlewares = {
+ ...SharedMiddlewares,
+ }
- handleWsAuth = require("@shared-lib/handleWsAuth").default
+ contexts = {
+ db: new DbManager(),
+ redis: RedisClient(),
+ }
- contexts = {
- db: new DbManager(),
- redis: RedisClient()
- }
-
- async onInitialize() {
- await this.contexts.db.initialize()
- await this.contexts.redis.initialize()
- }
+ async onInitialize() {
+ await this.contexts.db.initialize()
+ await this.contexts.redis.initialize()
+ }
}
-Boot(API)
\ No newline at end of file
+Boot(API)
diff --git a/packages/server/utils/bufferToStream.js b/packages/server/utils/bufferToStream.js
new file mode 100644
index 00000000..e735c77a
--- /dev/null
+++ b/packages/server/utils/bufferToStream.js
@@ -0,0 +1,10 @@
+import { Duplex } from "node:stream"
+
+export default (bf) => {
+ let tmp = new Duplex()
+
+ tmp.push(bf)
+ tmp.push(null)
+
+ return tmp
+}
diff --git a/packages/server/utils/readChunk.d.ts b/packages/server/utils/readChunk.d.ts
new file mode 100644
index 00000000..3b4efa36
--- /dev/null
+++ b/packages/server/utils/readChunk.d.ts
@@ -0,0 +1,7 @@
+export default function readChunk(
+ filePath: string,
+ options: {
+ length: number
+ startPosition: number
+ },
+): Promise
diff --git a/packages/server/utils/readChunk.js b/packages/server/utils/readChunk.js
new file mode 100644
index 00000000..3fe3a3c0
--- /dev/null
+++ b/packages/server/utils/readChunk.js
@@ -0,0 +1,22 @@
+// Original fork from https://github.com/sindresorhus/read-chunk
+import { open } from "node:fs/promises"
+
+export default async (filePath, { length, startPosition }) => {
+ const fileDescriptor = await open(filePath, "r")
+
+ try {
+ let { bytesRead, buffer } = await fileDescriptor.read({
+ buffer: new Uint8Array(length),
+ length,
+ position: startPosition,
+ })
+
+ if (bytesRead < length) {
+ buffer = buffer.subarray(0, bytesRead)
+ }
+
+ return buffer
+ } finally {
+ await fileDescriptor?.close()
+ }
+}
-
- }
+ return (
+ <>
+ {props.lyrics?.sync_audio_at && (
+
-
- Maximun latency
-{maxLatencyInMs}ms
-
-
- {syncingVideo ? Video Latency
-{(currentVideoLatency * 1000).toFixed(2)}ms
-Syncing video...
: null} -
+
+ )}
-
-
+
+
+ )
})
-export default LyricsVideo
\ No newline at end of file
+export default LyricsVideo
diff --git a/packages/app/src/pages/lyrics/index.jsx b/packages/app/src/pages/lyrics/index.jsx
index 3f0428ad..320ca842 100644
--- a/packages/app/src/pages/lyrics/index.jsx
+++ b/packages/app/src/pages/lyrics/index.jsx
@@ -89,7 +89,8 @@ const EnhancedLyricsPage = () => {
// Track manifest comparison
useEffect(() => {
- const newManifest = playerState.track_manifest?.toSeriableObject()
+ const newManifest = playerState.track_manifest
+
if (JSON.stringify(newManifest) !== JSON.stringify(trackManifest)) {
setTrackManifest(newManifest)
}
diff --git a/packages/app/src/settings/player/index.jsx b/packages/app/src/settings/player/index.jsx
index b8c3860c..f6bdb4fe 100755
--- a/packages/app/src/settings/player/index.jsx
+++ b/packages/app/src/settings/player/index.jsx
@@ -11,33 +11,33 @@ export default {
}
},
settings: [
- {
- id: "player.gain",
- title: "Gain",
- icon: "MdGraphicEq",
- group: "general",
- description: "Adjust gain for audio output",
- component: "Slider",
- props: {
- min: 1,
- max: 2,
- step: 0.1,
- marks: {
- 1: "Normal",
- 1.5: "+50%",
- 2: "+100%",
- },
- },
- defaultValue: () => {
- return app.cores.player.gain.values().gain
- },
- onUpdate: (value) => {
- app.cores.player.gain.modifyValues({
- gain: value,
- })
- },
- storaged: false,
- },
+ // {
+ // id: "player.gain",
+ // title: "Gain",
+ // icon: "MdGraphicEq",
+ // group: "general",
+ // description: "Adjust gain for audio output",
+ // component: "Slider",
+ // props: {
+ // min: 1,
+ // max: 2,
+ // step: 0.1,
+ // marks: {
+ // 1: "Normal",
+ // 1.5: "+50%",
+ // 2: "+100%",
+ // },
+ // },
+ // defaultValue: () => {
+ // return app.cores.player.gain.values().gain
+ // },
+ // onUpdate: (value) => {
+ // app.cores.player.gain.modifyValues({
+ // gain: value,
+ // })
+ // },
+ // storaged: false,
+ // },
{
id: "player.sample_rate",
title: "Sample Rate",
@@ -66,7 +66,7 @@ export default {
],
},
defaultValue: (ctx) => {
- return app.cores.player.audioContext.sampleRate
+ return app.cores.player.base().context.sampleRate
},
onUpdate: async (value) => {
const sampleRate =
@@ -94,10 +94,10 @@ export default {
onEnabledChange: (enabled) => {
if (enabled === true) {
app.cores.settings.set("player.compressor", true)
- app.cores.player.compressor.attach()
+ //app.cores.player.compressor.attach()
} else {
app.cores.settings.set("player.compressor", false)
- app.cores.player.compressor.detach()
+ //app.cores.player.compressor.detach()
}
},
extraActions: [
@@ -106,8 +106,9 @@ export default {
title: "Default",
icon: "MdRefresh",
onClick: async (ctx) => {
- const values =
- await app.cores.player.compressor.presets.setCurrentPresetToDefault()
+ const values = await app.cores.player
+ .base()
+ .processors.compressor.presets.setCurrentPresetToDefault()
ctx.updateCurrentValue(values)
},
@@ -152,13 +153,14 @@ export default {
],
},
onUpdate: (value) => {
- app.cores.player.compressor.presets.setToCurrent(value)
+ app.cores.player
+ .base()
+ .processors.compressor.presets.setToCurrent(value)
return value
},
storaged: false,
},
-
{
id: "player.eq",
title: "Equalizer",
@@ -172,8 +174,9 @@ export default {
title: "Reset",
icon: "MdRefresh",
onClick: (ctx) => {
- const values =
- app.cores.player.eq.presets.setCurrentPresetToDefault()
+ const values = app.cores.player
+ .base()
+ .processors.eq.presets.setCurrentPresetToDefault()
ctx.updateCurrentValue(values)
},
@@ -260,7 +263,9 @@ export default {
return acc
}, {})
- app.cores.player.eq.presets.setToCurrent(values)
+ app.cores.player
+ .base()
+ .processors.eq.presets.setToCurrent(values)
return value
},
diff --git a/packages/app/src/settings/player/items/player.compressor/index.jsx b/packages/app/src/settings/player/items/player.compressor/index.jsx
index 395c5d81..b10edac8 100755
--- a/packages/app/src/settings/player/items/player.compressor/index.jsx
+++ b/packages/app/src/settings/player/items/player.compressor/index.jsx
@@ -2,13 +2,11 @@ import { Switch } from "antd"
import SlidersWithPresets from "../../../components/slidersWithPresets"
export default (props) => {
- return
+
+ Maximun latency
+{maxLatencyInMs}ms
+
+
+ {syncingVideo ? Video Latency
+{(currentVideoLatency * 1000).toFixed(2)}ms
+Syncing video...
: null} +