kennethscoffee/starr-philproperties
1
0
Fork 0
mirror of https://github.com/rgrgogu/new_starr.git synced 2026-09-27 00:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit things

Browse Source 
Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>
This commit is contained in:
kennethobsequio
2026-08-09 13:00:26 +08:00
parent dcae93eb35
commit 30ec1330c6
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/client/courses.controller.js
+2 -2
View File
@@ -169,7 +169,7 @@ async function canAccessUnit(user_id, unit_id) {
attributes: ['course_id'], attributes: ['course_id'],
include: [{ model: Course, as: 'course', attributes: [], where: { status: 'published', ...notDeleted }, required: true }], include: [{ model: Course, as: 'course', attributes: [], where: { status: 'published', ...notDeleted }, required: true }],
}); });
if (!links.length) return !unit?.subscription; if (!links.length) return !unit?.subscription || unit.subscription === 'free';
for (const link of links) { for (const link of links) {
if (await canAccessCourse(user_id, link.course_id)) return true; if (await canAccessCourse(user_id, link.course_id)) return true;
} }
@@ -185,7 +185,7 @@ async function canAccessLesson(user_id, lesson_id) {
if (await hasActivePurchase(user_id, 'lesson', lesson_id)) return true; if (await hasActivePurchase(user_id, 'lesson', lesson_id)) return true;
const unitLinks = await UnitLesson.findAll({ where: { lesson_id }, attributes: ['unit_id'] }); const unitLinks = await UnitLesson.findAll({ where: { lesson_id }, attributes: ['unit_id'] });
if (!unitLinks.length) return !lesson?.subscription; if (!unitLinks.length) return !lesson?.subscription || lesson.subscription === 'free';
for (const link of unitLinks) { for (const link of unitLinks) {
if (await canAccessUnit(user_id, link.unit_id)) return true; if (await canAccessUnit(user_id, link.unit_id)) return true;
} }
controllers/client/media.controller.js
+15 -4
View File
@@ -97,7 +97,17 @@ function pipeRemoteStream(remoteUrl, req, res) {
let clientClosed = false; let clientClosed = false;
const proxyReq = transport.request(remoteUrl, { headers: proxyHeaders }, (proxyRes) => { const proxyReq = transport.request(remoteUrl, { headers: proxyHeaders }, (proxyRes) => {
const status = proxyRes.statusCode === 206 ? 206 : 200; const status = proxyRes.statusCode ?? 502;
// Upstream (Garage/S3) returned something other than a successful
// content response — surface the real failure instead of piping its
// (often tiny XML/JSON) error body through as if it were the file.
if (status !== 200 && status !== 206) {
proxyRes.resume(); // drain so the socket can close cleanly
console.error(`[CLIENT][MEDIA][PROXY] Upstream returned ${status} for ${remoteUrl}`);
if (!res.headersSent) res.status(502).json({ message: "Stream unavailable." });
return;
}
[ [
"content-type", "content-type",
@@ -210,9 +220,10 @@ exports.issueToken = async (req, res) => {
// 3. Requester IP matches the IP that issued the token // 3. Requester IP matches the IP that issued the token
// //
// Range requests for the same token are allowed (browser seeking). // Range requests for the same token are allowed (browser seeking).
// TEMPORARY: // pipeRemoteStream() above forwards the real upstream status instead of
// Same with problem from s3.service.js (Line 168-171) // collapsing everything to 200 — see its non-200/206 branch. A similar
// Investigate the issue ourselves. // swallowed-status issue may still exist in s3.service.js (~line 168-171),
// not addressed here.
exports.streamAsset = async (req, res) => { exports.streamAsset = async (req, res) => {
const { token } = req.params; const { token } = req.params;