Compare commits
19 Commits
bbc8c36439
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef7c24c884 | ||
|
|
f47ca67dae | ||
|
|
3737edab72 | ||
|
|
5195317c0c | ||
|
|
8aa1f3addd | ||
| af4471b463 | |||
|
|
f0afa200b1 | ||
|
|
503c5ef1f4 | ||
|
|
e8dd905f27 | ||
|
|
c5fd09d71d | ||
|
|
989fdce883 | ||
|
|
fd82643477 | ||
| 93d5b6b5f3 | |||
|
|
83727957ab | ||
| a8ddae4b1e | |||
|
|
77134b6bab | ||
|
|
d907aeecee | ||
|
|
1ca38ca3b9 | ||
|
|
e13678ad56 |
100
Agent.md
Normal file
100
Agent.md
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
# EMI Backend Agent Notes
|
||||||
|
|
||||||
|
## What this service is
|
||||||
|
- Node.js + Express API for EMI social features (profiles, posts, groups/courses, songs, payments, Bible/subsplash integrations).
|
||||||
|
- Main entrypoint: `index.js`.
|
||||||
|
- MongoDB Atlas-backed via `MONGO_URL` using `mongodb@3.6.x`.
|
||||||
|
|
||||||
|
## Runbook
|
||||||
|
- Install: `npm install`
|
||||||
|
- Start: `npm start` (binds to `PORT`, default `3000`)
|
||||||
|
- Test: `npm test` (single auth test file)
|
||||||
|
- API docs: `GET /api-docs`
|
||||||
|
|
||||||
|
## High-level architecture
|
||||||
|
- `index.js`: middleware setup, auth routes, route mounting, Swagger, web-push setup.
|
||||||
|
- `mongoDB.js`: creates shared DB object + collections + utility methods, then extends with:
|
||||||
|
- `dbTools/profile.js`
|
||||||
|
- `dbTools/post.js`
|
||||||
|
- `dbTools/payments.js`
|
||||||
|
- `dbTools/songs.js`
|
||||||
|
- `middleware/sessionChecker.js`: cookie/session validation and profile context hydration.
|
||||||
|
- `routes/*.js`: feature-specific routers.
|
||||||
|
- `def/*.js`: lightweight constructors for `Profile`, `Post`, `Songs`.
|
||||||
|
|
||||||
|
## Auth + session model
|
||||||
|
- Cookies used:
|
||||||
|
- `user_sid`
|
||||||
|
- `session_id`
|
||||||
|
- `profile_id`
|
||||||
|
- `sessionChecker` verifies ObjectId format, then checks session in `tokens` collection.
|
||||||
|
- On missing/invalid session/profile, user is redirected to `/login`.
|
||||||
|
- Most app routes are protected with `sessionChecker` except:
|
||||||
|
- `/signup`, `/login`, `/logout`, `/resetPassword`
|
||||||
|
- `/payments/*`
|
||||||
|
- `/subsplash/*`
|
||||||
|
- `/invite/:email`
|
||||||
|
|
||||||
|
## Key route surfaces
|
||||||
|
- `routes/profile.js`:
|
||||||
|
- Profile CRUD, invites, follow/unfollow, group/course discovery, subscribe/approve/reject flows.
|
||||||
|
- `routes/post.js`:
|
||||||
|
- Feed endpoints, tags/media filters, create/edit/delete posts, reactions/comments/bookmarks.
|
||||||
|
- Merges organic + non-organic posts (news/popular recommendations).
|
||||||
|
- `routes/payments.js`:
|
||||||
|
- Stripe payment intent creation + result registration; can toggle subscription timestamp.
|
||||||
|
- `routes/songs.js`:
|
||||||
|
- Song CRUD (ownership checks are effectively placeholder).
|
||||||
|
- `routes/bible.js`:
|
||||||
|
- Proxies scripture.api.bible endpoints using hardcoded API key in source.
|
||||||
|
- `routes/subsplash.js`:
|
||||||
|
- Scrapes Subsplash HTML with cheerio for events/media.
|
||||||
|
|
||||||
|
## Data model (collections)
|
||||||
|
- `users`: auth identity + password hash + optional customer.
|
||||||
|
- `tokens`: session documents (`uid` points to user).
|
||||||
|
- `invitation`: invite gating for signup.
|
||||||
|
- `profiles`: user/group/course/chat profile documents.
|
||||||
|
- `posts`: feed posts, reactions, comments, bookmarks, tags, non-organic type.
|
||||||
|
- `payments`: intent and payment result records.
|
||||||
|
- `songs`: song content metadata and reactions/comments.
|
||||||
|
|
||||||
|
## Important operational dependencies
|
||||||
|
- Mongo connection is required before server starts listening (`index.js` waits for `DB.getDB`).
|
||||||
|
- Notifications:
|
||||||
|
- Email via `nodemailer` SMTP (`mail.emmint.com`, env `EMAILPASS`).
|
||||||
|
- Mobile push via Expo (`expo-server-sdk`).
|
||||||
|
- Web push VAPID keys (`PUBLIC_VAPID_KEY`, `PRIVATE_VAPID_KEY`, `WEB_PUSH_EMAIL`).
|
||||||
|
- Analytics via PostHog (`POSTHOG_API_KEY`).
|
||||||
|
- Stripe via `STRIPE`.
|
||||||
|
|
||||||
|
## Environment/cookie/cors behavior
|
||||||
|
- Cookies configured in `config/cookiesOptions.js`:
|
||||||
|
- production or `COOKIE_SECURE=true` => `secure: true`, `sameSite: none`
|
||||||
|
- local HTTP => `secure: false`, `sameSite: lax`
|
||||||
|
- Allowed CORS origins in `config/corsOptions.js` are explicit list-based.
|
||||||
|
|
||||||
|
## Known code risks and maintenance hotspots
|
||||||
|
- Mixed ESM/CommonJS utility scripts (`AITools.js` uses ESM style while app is CommonJS).
|
||||||
|
- `routes/bible.js` has duplicate `/books` route and a probable bug in `/books/:bookId` (`bibleId` reference).
|
||||||
|
- Hardcoded external API key in `routes/bible.js` should be moved to env.
|
||||||
|
- `routes/songs.js` `songBelongsToUser` always returns true (authorization gap).
|
||||||
|
- Some endpoints return redirect-to-login for API callers instead of structured 401 JSON.
|
||||||
|
- Inconsistent error handling/response shapes across routes.
|
||||||
|
- Legacy driver/runtime tension:
|
||||||
|
- Dependency is `mongodb@3.6.x`
|
||||||
|
- `Dockerfile` uses Node 22, but code warns Node 22 is not fully tested; Node 20 LTS is safer.
|
||||||
|
|
||||||
|
## Testing state
|
||||||
|
- Only `test/auth.test.js` exists; no broad coverage for routes/db tools.
|
||||||
|
- Auth test expects existing seeded user behavior, so reliability depends on DB fixture state.
|
||||||
|
|
||||||
|
## Suggested workflow for future changes
|
||||||
|
- Keep fixes scoped and defensive (null checks + stable JSON).
|
||||||
|
- For auth/session changes:
|
||||||
|
- update both `sessionChecker` and `utils/sessionUtils.js`.
|
||||||
|
- For profile/post behavior:
|
||||||
|
- confirm DB helper method side effects in `dbTools/*`.
|
||||||
|
- For production incidents:
|
||||||
|
- first validate `MONGO_URL` connectivity and cookie security mode alignment.
|
||||||
|
|
||||||
@@ -3,7 +3,7 @@ const { client_logger } = require('../utils/analyticsLogger');
|
|||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require('bcrypt');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const { getSessionId, getUserId, getProfileId } = require('../utils/sessionUtils.js');
|
const { getSessionId, getUserId, getProfileId } = require('../utils/sessionUtils.js');
|
||||||
const { cookiesOptions } = require('../config/cookiesOptions');
|
const { getCookiesOptions } = require('../config/cookiesOptions');
|
||||||
const Notifications = require("../notifications");
|
const Notifications = require("../notifications");
|
||||||
|
|
||||||
// Object Definitions
|
// Object Definitions
|
||||||
@@ -19,6 +19,7 @@ const createPasswordTokenHash = (rawToken) =>
|
|||||||
|
|
||||||
const createSessionFromUser = async ({ DB, user, req, res }) => {
|
const createSessionFromUser = async ({ DB, user, req, res }) => {
|
||||||
const sessionObj = await DB.newSession(user._id);
|
const sessionObj = await DB.newSession(user._id);
|
||||||
|
const cookiesOptions = getCookiesOptions(req);
|
||||||
res.cookie('user_sid', user._id, cookiesOptions);
|
res.cookie('user_sid', user._id, cookiesOptions);
|
||||||
res.cookie('session_id', sessionObj.insertedId, cookiesOptions);
|
res.cookie('session_id', sessionObj.insertedId, cookiesOptions);
|
||||||
const latestUpdatedProfile = await DB.latestProfile(user._id);
|
const latestUpdatedProfile = await DB.latestProfile(user._id);
|
||||||
@@ -143,8 +144,9 @@ const logout = async function (req, res) {
|
|||||||
const session_id = getSessionId(req);
|
const session_id = getSessionId(req);
|
||||||
const user_sid = getUserId(req);
|
const user_sid = getUserId(req);
|
||||||
if (session_id && user_sid) {
|
if (session_id && user_sid) {
|
||||||
res.clearCookie('session_id');
|
const cookiesOptions = getCookiesOptions(req);
|
||||||
res.clearCookie('user_sid');
|
res.clearCookie('session_id', cookiesOptions);
|
||||||
|
res.clearCookie('user_sid', cookiesOptions);
|
||||||
//remove from DB
|
//remove from DB
|
||||||
const DB = await MongoDB.getDB;
|
const DB = await MongoDB.getDB;
|
||||||
DB.removeSession(session_id);
|
DB.removeSession(session_id);
|
||||||
|
|||||||
@@ -1,12 +1,49 @@
|
|||||||
const isProduction = process.env.NODE_ENV === "production";
|
const isProduction = process.env.NODE_ENV === "production";
|
||||||
const forceSecureCookie = process.env.COOKIE_SECURE === "true";
|
const forceSecureCookie = process.env.COOKIE_SECURE === "true";
|
||||||
const secure = forceSecureCookie || isProduction;
|
|
||||||
|
|
||||||
const cookiesOptions = {
|
const COOKIE_MAX_AGE_MS = 1000 * 60 * 60 * 24 * 90; // 90 days
|
||||||
maxAge: 1000 * 60 * 60 * 24 * 90, // would expire after 90 days
|
const LOCAL_ORIGIN_REGEX = /^http:\/\/(localhost|127\.0\.0\.1|aeropi\.local)(:\d+)?$/i;
|
||||||
httpOnly: true, // The cookie only accessible by the web server
|
const LOCAL_HOST_REGEX = /^(localhost|127\.0\.0\.1|aeropi\.local)(:\d+)?$/i;
|
||||||
sameSite: secure ? 'none' : 'lax',
|
|
||||||
secure,
|
const getHeaderValue = (req, key) => {
|
||||||
|
if (!req || !req.headers) return "";
|
||||||
|
const raw = req.headers[key];
|
||||||
|
if (Array.isArray(raw)) return raw[0] || "";
|
||||||
|
return raw || "";
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = { cookiesOptions };
|
const isLocalRequest = (req) => {
|
||||||
|
const origin = getHeaderValue(req, "origin");
|
||||||
|
const host = getHeaderValue(req, "host");
|
||||||
|
return LOCAL_ORIGIN_REGEX.test(origin) || LOCAL_HOST_REGEX.test(host);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isHttpsRequest = (req) => {
|
||||||
|
if (!req) return false;
|
||||||
|
const forwardedProto = String(getHeaderValue(req, "x-forwarded-proto")).split(",")[0].trim().toLowerCase();
|
||||||
|
const reqProtocol = String(req.protocol || "").toLowerCase();
|
||||||
|
const origin = String(getHeaderValue(req, "origin") || "").toLowerCase();
|
||||||
|
if (forwardedProto === "https" || reqProtocol === "https") return true;
|
||||||
|
return origin.startsWith("https://");
|
||||||
|
};
|
||||||
|
|
||||||
|
const shouldUseSecureCookie = (req) => {
|
||||||
|
if (forceSecureCookie) return true;
|
||||||
|
if (isLocalRequest(req)) return false;
|
||||||
|
if (isHttpsRequest(req)) return true;
|
||||||
|
return isProduction;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getCookiesOptions = (req) => {
|
||||||
|
const secure = shouldUseSecureCookie(req);
|
||||||
|
return {
|
||||||
|
maxAge: COOKIE_MAX_AGE_MS,
|
||||||
|
httpOnly: true,
|
||||||
|
sameSite: secure ? "none" : "lax",
|
||||||
|
secure,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const cookiesOptions = getCookiesOptions();
|
||||||
|
|
||||||
|
module.exports = { cookiesOptions, getCookiesOptions };
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ var corsOptions = {
|
|||||||
'http://127.0.0.1:8081',
|
'http://127.0.0.1:8081',
|
||||||
'http://localhost:3000',
|
'http://localhost:3000',
|
||||||
"https://social.emmint.com",
|
"https://social.emmint.com",
|
||||||
|
"https://www.social.emmint.com",
|
||||||
"https://fellowship.emmint.com",
|
"https://fellowship.emmint.com",
|
||||||
"https://aeropi.local",
|
"https://aeropi.local",
|
||||||
],
|
],
|
||||||
|
|||||||
69
dbTools/chat.js
Normal file
69
dbTools/chat.js
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
const DBName = "EMI_SOCIAL";
|
||||||
|
|
||||||
|
const chatDB = (DB) => {
|
||||||
|
DB.chatMessagesCol = DB.db.db(DBName).collection("chat_messages");
|
||||||
|
DB.chatMessagesCol.createIndex({ createdAt: -1 }).catch(console.error);
|
||||||
|
|
||||||
|
DB.addChatMessage = async ({ senderId, senderProfileId, senderName, text, sourceLang }) => {
|
||||||
|
const safeText = (text || "").trim();
|
||||||
|
if (!safeText) return false;
|
||||||
|
const message = {
|
||||||
|
senderId: senderId ? senderId + "" : "",
|
||||||
|
senderProfileId: senderProfileId ? senderProfileId + "" : "",
|
||||||
|
senderName: senderName || "Anonymous",
|
||||||
|
text: safeText,
|
||||||
|
sourceLang: sourceLang || "en",
|
||||||
|
translations: {},
|
||||||
|
createdAt: new Date(),
|
||||||
|
};
|
||||||
|
const result = await DB.chatMessagesCol.insertOne(message).catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
if (!result || !result.insertedId) return false;
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
_id: result.insertedId,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
DB.getChatParticipants = async () => {
|
||||||
|
return DB.chatMessagesCol.distinct("senderProfileId").catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return [];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
DB.getRecentChatMessages = async (limit = 100) => {
|
||||||
|
const safeLimit = Math.min(Math.max(parseInt(limit, 10) || 100, 1), 200);
|
||||||
|
const messages = await DB.chatMessagesCol.find({})
|
||||||
|
.sort({ createdAt: -1 })
|
||||||
|
.limit(safeLimit)
|
||||||
|
.toArray()
|
||||||
|
.catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return [];
|
||||||
|
});
|
||||||
|
return messages.reverse();
|
||||||
|
};
|
||||||
|
|
||||||
|
DB.setChatMessageTranslation = async ({ messageId, targetLang, text, provider, model }) => {
|
||||||
|
if (!messageId || !targetLang || !text) return false;
|
||||||
|
const _id = typeof messageId === "string" ? DB.ObjectID(messageId) : messageId;
|
||||||
|
const fieldBase = `translations.${targetLang}`;
|
||||||
|
const update = {
|
||||||
|
$set: {
|
||||||
|
[`${fieldBase}.text`]: text,
|
||||||
|
[`${fieldBase}.provider`]: provider || "openai",
|
||||||
|
[`${fieldBase}.model`]: model || "",
|
||||||
|
[`${fieldBase}.updatedAt`]: new Date(),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
return DB.chatMessagesCol.updateOne({ _id }, update).catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = chatDB;
|
||||||
@@ -38,6 +38,20 @@ postDB = (DB)=>{
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DB.addTranslation = (postid, lang, translatedText) => {
|
||||||
|
if(!DB.ObjectID.isValid(postid)) return false;
|
||||||
|
const id = DB.ObjectID(postid);
|
||||||
|
let update = {
|
||||||
|
$set:{
|
||||||
|
["translations." + lang]: translatedText
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return DB.postCols.updateOne({_id: id}, update).catch((err)=>{
|
||||||
|
console.log(err);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
DB.newReaction = (postid, profileid, reaction) => {
|
DB.newReaction = (postid, profileid, reaction) => {
|
||||||
if(!DB.ObjectID.isValid(postid)) return false;
|
if(!DB.ObjectID.isValid(postid)) return false;
|
||||||
const id = DB.ObjectID(postid);
|
const id = DB.ObjectID(postid);
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ userDB = (DB) => {
|
|||||||
|
|
||||||
DB.updateProfile = async (profileid, profileObj) => {
|
DB.updateProfile = async (profileid, profileObj) => {
|
||||||
let tempProfile = profileObj.toObj();
|
let tempProfile = profileObj.toObj();
|
||||||
const query = { _id: profileid };
|
if (!DB.ObjectID.isValid(profileid)) return false;
|
||||||
|
const _id = DB.ObjectID(profileid);
|
||||||
|
const query = { _id };
|
||||||
const update = {
|
const update = {
|
||||||
$set: {
|
$set: {
|
||||||
profile: tempProfile.profile,
|
profile: tempProfile.profile,
|
||||||
@@ -34,6 +36,7 @@ userDB = (DB) => {
|
|||||||
console.log(err);
|
console.log(err);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
if (userProfileCache[profileid]) delete userProfileCache[profileid];
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,13 +284,36 @@ userDB = (DB) => {
|
|||||||
postid,
|
postid,
|
||||||
commentIndx,
|
commentIndx,
|
||||||
actorid,
|
actorid,
|
||||||
|
viewed: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return DB.profileCols.updateOne({ _id }, update).catch((err) => {
|
const r = await DB.profileCols.updateOne({ _id }, update).catch((err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
if (userProfileCache[profileid]) delete userProfileCache[profileid];
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB.markNotificationsViewed = async (profileid) => {
|
||||||
|
const _id = DB.ObjectID(profileid);
|
||||||
|
const update = {
|
||||||
|
$set: {
|
||||||
|
"notifications.$[n].viewed": true
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const options = {
|
||||||
|
arrayFilters: [
|
||||||
|
{ "n.viewed": { $ne: true } }
|
||||||
|
]
|
||||||
|
};
|
||||||
|
const r = await DB.profileCols.updateOne({ _id }, update, options).catch((err) => {
|
||||||
|
console.log(err);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
if (userProfileCache[profileid]) delete userProfileCache[profileid];
|
||||||
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
DB.isSubscriptor = async (profileid) => {
|
DB.isSubscriptor = async (profileid) => {
|
||||||
|
|||||||
9
index.js
9
index.js
@@ -29,6 +29,7 @@ const limiter = rateLimit({
|
|||||||
limit: 500, // Limit each IP to 100 requests per `window` (here, per 15 minutes).
|
limit: 500, // Limit each IP to 100 requests per `window` (here, per 15 minutes).
|
||||||
standardHeaders: 'draft-8', // draft-6: `RateLimit-*` headers; draft-7 & draft-8: combined `RateLimit` header
|
standardHeaders: 'draft-8', // draft-6: `RateLimit-*` headers; draft-7 & draft-8: combined `RateLimit` header
|
||||||
legacyHeaders: false, // Disable the `X-RateLimit-*` headers.
|
legacyHeaders: false, // Disable the `X-RateLimit-*` headers.
|
||||||
|
skip: (req) => req.path.startsWith("/live-captions"),
|
||||||
keyGenerator: (req) => {
|
keyGenerator: (req) => {
|
||||||
const forwarded = req.headers["x-forwarded-for"]?.split(",")[0]; // Take the first IP in the list
|
const forwarded = req.headers["x-forwarded-for"]?.split(",")[0]; // Take the first IP in the list
|
||||||
const ip = forwarded || req.ip; // Fallback to req.ip
|
const ip = forwarded || req.ip; // Fallback to req.ip
|
||||||
@@ -183,6 +184,8 @@ const postRoute = require('./routes/post.js');
|
|||||||
const songsRoute = require('./routes/songs.js');
|
const songsRoute = require('./routes/songs.js');
|
||||||
const paymentsRoute = require('./routes/payments.js');
|
const paymentsRoute = require('./routes/payments.js');
|
||||||
const bibleRoute = require('./routes/bible.js');
|
const bibleRoute = require('./routes/bible.js');
|
||||||
|
const chatRoute = require('./routes/chat.js');
|
||||||
|
const liveCaptionsRoute = require('./routes/liveCaptions.js');
|
||||||
const sessionChecker = require('./middleware/sessionChecker');
|
const sessionChecker = require('./middleware/sessionChecker');
|
||||||
// -- Private Routes
|
// -- Private Routes
|
||||||
app.use('/user', sessionChecker, profileRoute);
|
app.use('/user', sessionChecker, profileRoute);
|
||||||
@@ -190,6 +193,8 @@ app.use('/post', sessionChecker, postRoute);
|
|||||||
app.use('/payments', paymentsRoute);
|
app.use('/payments', paymentsRoute);
|
||||||
app.use('/bible', sessionChecker, bibleRoute);
|
app.use('/bible', sessionChecker, bibleRoute);
|
||||||
app.use('/songs', sessionChecker, songsRoute);
|
app.use('/songs', sessionChecker, songsRoute);
|
||||||
|
app.use('/chat', sessionChecker, chatRoute);
|
||||||
|
app.use('/live-captions', liveCaptionsRoute);
|
||||||
// -- Public Routes
|
// -- Public Routes
|
||||||
const subsplashRoute = require('./routes/subsplash.js');
|
const subsplashRoute = require('./routes/subsplash.js');
|
||||||
app.use('/subsplash', subsplashRoute);
|
app.use('/subsplash', subsplashRoute);
|
||||||
@@ -238,7 +243,7 @@ const webPushEmail = process.env.WEB_PUSH_EMAIL;
|
|||||||
webPush.setVapidDetails('mailto:' + webPushEmail, publicVapidKey, privateVapidKey);
|
webPush.setVapidDetails('mailto:' + webPushEmail, publicVapidKey, privateVapidKey);
|
||||||
|
|
||||||
|
|
||||||
const { cookiesOptions } = require('./config/cookiesOptions');
|
const { getCookiesOptions } = require('./config/cookiesOptions');
|
||||||
const { client_logger } = require('./utils/analyticsLogger.js');
|
const { client_logger } = require('./utils/analyticsLogger.js');
|
||||||
const { getSessionId, getUserId, getProfileId } = require('./utils/sessionUtils.js');
|
const { getSessionId, getUserId, getProfileId } = require('./utils/sessionUtils.js');
|
||||||
|
|
||||||
@@ -408,7 +413,7 @@ DB.getDB.then((DB) => {
|
|||||||
return res.status(403).json({ status: "Profile does not belong to the logged-in user" });
|
return res.status(403).json({ status: "Profile does not belong to the logged-in user" });
|
||||||
}
|
}
|
||||||
// Update active profile cookie
|
// Update active profile cookie
|
||||||
res.cookie('profile_id', profile._id, cookiesOptions);
|
res.cookie('profile_id', profile._id, getCookiesOptions(req));
|
||||||
return res.json({ status: "ok", profile });
|
return res.json({ status: "ok", profile });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error changing profile:", error);
|
console.error("Error changing profile:", error);
|
||||||
|
|||||||
@@ -1,9 +1,22 @@
|
|||||||
const { getSessionId, getUserId, getProfileId } = require('../utils/sessionUtils');
|
const { getSessionId, getUserId, getProfileId } = require('../utils/sessionUtils');
|
||||||
const { client_logger } = require('../utils/analyticsLogger');
|
const { client_logger } = require('../utils/analyticsLogger');
|
||||||
const { cookiesOptions } = require('../config/cookiesOptions');
|
const { getCookiesOptions } = require('../config/cookiesOptions');
|
||||||
const MongoDB = require("../mongoDB.js");
|
const MongoDB = require("../mongoDB.js");
|
||||||
const { ObjectId } = require("mongodb");
|
const { ObjectId } = require("mongodb");
|
||||||
|
|
||||||
|
const shouldReturnJson = (req) => {
|
||||||
|
const accept = String(req?.headers?.accept || "").toLowerCase();
|
||||||
|
const contentType = String(req?.headers?.["content-type"] || "").toLowerCase();
|
||||||
|
return !!req?.headers?.origin || accept.includes("application/json") || contentType.includes("application/json");
|
||||||
|
};
|
||||||
|
|
||||||
|
const rejectUnauthorized = (req, res) => {
|
||||||
|
if (shouldReturnJson(req)) {
|
||||||
|
return res.status(401).json({ status: "Unauthorized" });
|
||||||
|
}
|
||||||
|
return res.redirect('/login');
|
||||||
|
};
|
||||||
|
|
||||||
const sessionChecker = async (req, res, next) => {
|
const sessionChecker = async (req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const session_id = getSessionId(req);
|
const session_id = getSessionId(req);
|
||||||
@@ -11,10 +24,10 @@ const sessionChecker = async (req, res, next) => {
|
|||||||
let profile_id = getProfileId(req);
|
let profile_id = getProfileId(req);
|
||||||
|
|
||||||
if (!session_id || !user_sid) {
|
if (!session_id || !user_sid) {
|
||||||
return res.redirect('/login');
|
return rejectUnauthorized(req, res);
|
||||||
}
|
}
|
||||||
if (!ObjectId.isValid(session_id) || !ObjectId.isValid(user_sid)) {
|
if (!ObjectId.isValid(session_id) || !ObjectId.isValid(user_sid)) {
|
||||||
return res.redirect('/login');
|
return rejectUnauthorized(req, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
const DB = await MongoDB.getDB;
|
const DB = await MongoDB.getDB;
|
||||||
@@ -24,15 +37,15 @@ const sessionChecker = async (req, res, next) => {
|
|||||||
if (!await DB.getProfileCache(profile_id)) {
|
if (!await DB.getProfileCache(profile_id)) {
|
||||||
const latestProfile = await DB.latestProfile(user_sid);
|
const latestProfile = await DB.latestProfile(user_sid);
|
||||||
if (!latestProfile || !latestProfile._id) {
|
if (!latestProfile || !latestProfile._id) {
|
||||||
return res.redirect('/login');
|
return rejectUnauthorized(req, res);
|
||||||
}
|
}
|
||||||
res.cookie('profile_id', latestProfile._id, cookiesOptions);
|
res.cookie('profile_id', latestProfile._id, getCookiesOptions(req));
|
||||||
profile_id = latestProfile._id;
|
profile_id = latestProfile._id;
|
||||||
}
|
}
|
||||||
|
|
||||||
req.profileInfo = { _id: profile_id };
|
req.profileInfo = { _id: profile_id };
|
||||||
|
|
||||||
if (!userInfo) return res.redirect('/login');
|
if (!userInfo) return rejectUnauthorized(req, res);
|
||||||
|
|
||||||
client_logger.capture({
|
client_logger.capture({
|
||||||
distinctId: user_sid,
|
distinctId: user_sid,
|
||||||
@@ -42,7 +55,7 @@ const sessionChecker = async (req, res, next) => {
|
|||||||
next();
|
next();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Session checker error", error);
|
console.error("Session checker error", error);
|
||||||
return res.redirect('/login');
|
return rejectUnauthorized(req, res);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ const postDB = require("./dbTools/post.js");
|
|||||||
const profileDB = require("./dbTools/profile.js");
|
const profileDB = require("./dbTools/profile.js");
|
||||||
const paymentDB = require("./dbTools/payments.js");
|
const paymentDB = require("./dbTools/payments.js");
|
||||||
const songsDB = require("./dbTools/songs.js");
|
const songsDB = require("./dbTools/songs.js");
|
||||||
|
const chatDB = require("./dbTools/chat.js");
|
||||||
|
|
||||||
console.log("Connecting to MongoDB...");
|
console.log("Connecting to MongoDB...");
|
||||||
const nodeMajorVersion = parseInt((process.versions.node || "0").split(".")[0], 10);
|
const nodeMajorVersion = parseInt((process.versions.node || "0").split(".")[0], 10);
|
||||||
@@ -177,6 +178,7 @@ const getDB = new Promise((resolve, reject) => {
|
|||||||
profileDB(DB);
|
profileDB(DB);
|
||||||
paymentDB(DB);
|
paymentDB(DB);
|
||||||
songsDB(DB);
|
songsDB(DB);
|
||||||
|
chatDB(DB);
|
||||||
|
|
||||||
resolve(DB);
|
resolve(DB);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -489,6 +489,26 @@ const Notifications = {
|
|||||||
// sendWebNotification(requesterProfile.webSubscription, notifBody);
|
// sendWebNotification(requesterProfile.webSubscription, notifBody);
|
||||||
DB.addNotification(requesterProfile, notifBody, null, null, groupProfile._id);
|
DB.addNotification(requesterProfile, notifBody, null, null, groupProfile._id);
|
||||||
},
|
},
|
||||||
|
async youGotANewChatMessage(senderProfileId, messageText) {
|
||||||
|
const DB = await DBGetter.getDB;
|
||||||
|
const participants = await DB.getChatParticipants();
|
||||||
|
const senderProfile = await DB.getProfileCache(senderProfileId);
|
||||||
|
|
||||||
|
const tokens = [];
|
||||||
|
for (const participantProfileId of participants) {
|
||||||
|
if (participantProfileId.toString() === senderProfileId.toString()) continue;
|
||||||
|
|
||||||
|
const participantProfile = await DB.getProfileCache(participantProfileId);
|
||||||
|
if (participantProfile && Array.isArray(participantProfile.token)) {
|
||||||
|
tokens.push(...participantProfile.token);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens.length > 0) {
|
||||||
|
const notifBody = `${senderProfile.profile.firstName}: ${messageText.substring(0, 100)}${messageText.length > 100 ? '...' : ''}`;
|
||||||
|
sendPushNotification(tokens, notifBody, { type: 'chat' });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "npx mocha test/auth.test.js",
|
"test": "npx mocha test/auth.test.js",
|
||||||
"start": "node index.js",
|
"start": "node index.js",
|
||||||
|
"dev": "node --watch index.js",
|
||||||
|
"live-captions:test-sender": "node scripts/liveCaptionsTestSender.js",
|
||||||
"docker": "docker compose up -d",
|
"docker": "docker compose up -d",
|
||||||
"docker_restore": "docker-compose exec mongo mongorestore --db EMI_SOCIAL /dump/EMI_SOCIAL/",
|
"docker_restore": "docker-compose exec mongo mongorestore --db EMI_SOCIAL /dump/EMI_SOCIAL/",
|
||||||
"docker_dump": "docker-compose exec mongo mongodump --uri ${MONGO_URL} --out /dump"
|
"docker_dump": "docker-compose exec mongo mongodump --uri ${MONGO_URL} --out /dump"
|
||||||
|
|||||||
@@ -148,7 +148,8 @@ DB.getDB.then((DB) => {
|
|||||||
router.get("/chapters/:chapterId", async (req, res) => {
|
router.get("/chapters/:chapterId", async (req, res) => {
|
||||||
const chapterId = req.params.chapterId;
|
const chapterId = req.params.chapterId;
|
||||||
const bibleId = req.query.bibleId || defaultBibleId;
|
const bibleId = req.query.bibleId || defaultBibleId;
|
||||||
const bibles = await fetchAPI('bibles/' + bibleId + "/chapters/" + chapterId);
|
const contentType = req.query['content-type'] ? `?content-type=${req.query['content-type']}` : '';
|
||||||
|
const bibles = await fetchAPI('bibles/' + bibleId + "/chapters/" + chapterId + contentType);
|
||||||
return res.json(bibles);
|
return res.json(bibles);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
241
routes/chat.js
Normal file
241
routes/chat.js
Normal file
@@ -0,0 +1,241 @@
|
|||||||
|
var express = require('express');
|
||||||
|
var router = express.Router();
|
||||||
|
|
||||||
|
const DB = require("../mongoDB.js");
|
||||||
|
const Notifications = require("../notifications.js");
|
||||||
|
const { getUserId, getProfileId } = require("../utils/sessionUtils.js");
|
||||||
|
const { normalizeLanguageCode, translateText } = require("../utils/chatTranslation.js");
|
||||||
|
|
||||||
|
const ACTIVE_WINDOW_MS = 120000;
|
||||||
|
const MESSAGE_MAX_LENGTH = 500;
|
||||||
|
const activeUsers = new Map();
|
||||||
|
const translationInflight = new Map();
|
||||||
|
|
||||||
|
const toDisplayName = (profile, fallbackName) => {
|
||||||
|
const firstName = profile?.profile?.firstName || "";
|
||||||
|
const lastName = profile?.profile?.lastName || "";
|
||||||
|
const displayName = (firstName + " " + lastName).trim();
|
||||||
|
return displayName || fallbackName || "Anonymous";
|
||||||
|
};
|
||||||
|
|
||||||
|
const pruneActiveUsers = () => {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [profileId, entry] of activeUsers.entries()) {
|
||||||
|
if (now - entry.lastSeen > ACTIVE_WINDOW_MS) {
|
||||||
|
activeUsers.delete(profileId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getActiveUsersList = () => {
|
||||||
|
pruneActiveUsers();
|
||||||
|
return Array.from(activeUsers.values())
|
||||||
|
.sort((a, b) => b.lastSeen - a.lastSeen)
|
||||||
|
.map((entry) => ({
|
||||||
|
profileId: entry.profileId,
|
||||||
|
userId: entry.userId,
|
||||||
|
displayName: entry.displayName,
|
||||||
|
lastSeen: entry.lastSeen,
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
DB.getDB.then((DB) => {
|
||||||
|
const resolveTargetLanguage = (req) => {
|
||||||
|
const requested = req.query?.lang || req.headers["x-app-language"] || req.headers["accept-language"] || "en";
|
||||||
|
return normalizeLanguageCode(requested);
|
||||||
|
};
|
||||||
|
|
||||||
|
const mapChatMessageForLanguage = async (message, targetLang) => {
|
||||||
|
const normalizedTarget = normalizeLanguageCode(targetLang);
|
||||||
|
const sourceLang = normalizeLanguageCode(message?.sourceLang || "auto");
|
||||||
|
const originalText = message?.text || "";
|
||||||
|
|
||||||
|
if (!originalText) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
textOriginal: "",
|
||||||
|
text: "",
|
||||||
|
displayLang: sourceLang,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sourceLang === normalizedTarget) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
textOriginal: originalText,
|
||||||
|
text: originalText,
|
||||||
|
displayLang: sourceLang,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const cachedTranslation = message?.translations?.[normalizedTarget]?.text;
|
||||||
|
if (cachedTranslation) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
textOriginal: originalText,
|
||||||
|
text: cachedTranslation,
|
||||||
|
displayLang: normalizedTarget,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const translationKey = `${message?._id?.toString?.() || ""}:${normalizedTarget}`;
|
||||||
|
if (translationInflight.has(translationKey)) {
|
||||||
|
await translationInflight.get(translationKey);
|
||||||
|
const refreshed = await DB.chatMessagesCol.findOne({ _id: message._id }).catch(() => null);
|
||||||
|
const refreshedCached = refreshed?.translations?.[normalizedTarget]?.text;
|
||||||
|
if (refreshedCached) {
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
translations: refreshed.translations,
|
||||||
|
textOriginal: originalText,
|
||||||
|
text: refreshedCached,
|
||||||
|
displayLang: normalizedTarget,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
textOriginal: originalText,
|
||||||
|
text: originalText,
|
||||||
|
displayLang: sourceLang,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const inFlightTask = (async () => {
|
||||||
|
const translated = await translateText({
|
||||||
|
text: originalText,
|
||||||
|
sourceLang,
|
||||||
|
targetLang: normalizedTarget,
|
||||||
|
});
|
||||||
|
if (!translated?.translatedText) return null;
|
||||||
|
await DB.setChatMessageTranslation({
|
||||||
|
messageId: message._id,
|
||||||
|
targetLang: normalizedTarget,
|
||||||
|
text: translated.translatedText,
|
||||||
|
provider: translated.provider,
|
||||||
|
model: translated.model,
|
||||||
|
});
|
||||||
|
return translated.translatedText;
|
||||||
|
})();
|
||||||
|
|
||||||
|
translationInflight.set(translationKey, inFlightTask);
|
||||||
|
let translatedText = null;
|
||||||
|
try {
|
||||||
|
translatedText = await inFlightTask;
|
||||||
|
} finally {
|
||||||
|
translationInflight.delete(translationKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
...message,
|
||||||
|
textOriginal: originalText,
|
||||||
|
text: translatedText || originalText,
|
||||||
|
displayLang: translatedText ? normalizedTarget : sourceLang,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const markActiveUser = async (req) => {
|
||||||
|
const userId = getUserId(req);
|
||||||
|
const profileId = req.profileInfo?._id || getProfileId(req);
|
||||||
|
if (!profileId || !userId) return null;
|
||||||
|
const profile = await DB.getProfileCache(profileId);
|
||||||
|
const displayName = toDisplayName(profile, req.userInfo?.username);
|
||||||
|
activeUsers.set(profileId + "", {
|
||||||
|
profileId: profileId + "",
|
||||||
|
userId: userId + "",
|
||||||
|
displayName,
|
||||||
|
lastSeen: Date.now(),
|
||||||
|
});
|
||||||
|
return activeUsers.get(profileId + "");
|
||||||
|
};
|
||||||
|
|
||||||
|
router.get("/messages", async (req, res) => {
|
||||||
|
try {
|
||||||
|
await markActiveUser(req);
|
||||||
|
const targetLang = resolveTargetLanguage(req);
|
||||||
|
const messages = await DB.getRecentChatMessages(req.query.limit || 100);
|
||||||
|
const translatedMessages = await Promise.all(messages.map((message) => mapChatMessageForLanguage(message, targetLang)));
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
requestedLang: targetLang,
|
||||||
|
messages: translatedMessages,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error getting chat messages", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error", messages: [] });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post("/messages", async (req, res) => {
|
||||||
|
try {
|
||||||
|
const userId = getUserId(req);
|
||||||
|
const profileId = req.profileInfo?._id || getProfileId(req);
|
||||||
|
const text = typeof req.body?.text === "string" ? req.body.text.trim() : "";
|
||||||
|
const sourceLang = normalizeLanguageCode(req.body?.sourceLang || req.headers["x-app-language"] || "en");
|
||||||
|
if (!text) {
|
||||||
|
return res.status(400).json({ status: "Message text is required" });
|
||||||
|
}
|
||||||
|
if (text.length > MESSAGE_MAX_LENGTH) {
|
||||||
|
return res.status(400).json({ status: `Message too long (${MESSAGE_MAX_LENGTH} max chars)` });
|
||||||
|
}
|
||||||
|
|
||||||
|
const profile = await DB.getProfileCache(profileId);
|
||||||
|
const senderName = toDisplayName(profile, req.userInfo?.username);
|
||||||
|
const message = await DB.addChatMessage({
|
||||||
|
senderId: userId,
|
||||||
|
senderProfileId: profileId,
|
||||||
|
senderName,
|
||||||
|
text,
|
||||||
|
sourceLang,
|
||||||
|
});
|
||||||
|
if (!message) {
|
||||||
|
return res.status(500).json({ status: "Could not save message" });
|
||||||
|
}
|
||||||
|
|
||||||
|
Notifications.youGotANewChatMessage(profileId, text);
|
||||||
|
|
||||||
|
activeUsers.set(profileId + "", {
|
||||||
|
profileId: profileId + "",
|
||||||
|
userId: userId + "",
|
||||||
|
displayName: senderName,
|
||||||
|
lastSeen: Date.now(),
|
||||||
|
});
|
||||||
|
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
message,
|
||||||
|
activeUsers: getActiveUsersList(),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error posting chat message", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.get("/active", async (req, res) => {
|
||||||
|
try {
|
||||||
|
await markActiveUser(req);
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
activeUsers: getActiveUsersList(),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error getting active chat users", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error", activeUsers: [] });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post("/ping", async (req, res) => {
|
||||||
|
try {
|
||||||
|
await markActiveUser(req);
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
activeUsers: getActiveUsersList(),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error updating chat presence", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error", activeUsers: [] });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
247
routes/liveCaptions.js
Normal file
247
routes/liveCaptions.js
Normal file
@@ -0,0 +1,247 @@
|
|||||||
|
var express = require('express');
|
||||||
|
var router = express.Router();
|
||||||
|
const { rateLimit } = require("express-rate-limit");
|
||||||
|
|
||||||
|
const sessionChecker = require("../middleware/sessionChecker.js");
|
||||||
|
|
||||||
|
const MAX_BUFFER_SIZE = 300;
|
||||||
|
const DEFAULT_INITIAL_LIMIT = 40;
|
||||||
|
const MAX_INITIAL_LIMIT = 120;
|
||||||
|
const INACTIVITY_RESET_MS = 10 * 60 * 1000;
|
||||||
|
const CAPTION_META_KEYS = new Set(["sequence", "createdAt", "original", "draft", "sourceLang", "lang", "isDraft", "status", "translations"]);
|
||||||
|
|
||||||
|
const liveCaptionState = {
|
||||||
|
startedAt: Date.now(),
|
||||||
|
lastIngestAt: 0,
|
||||||
|
latestSequence: 0,
|
||||||
|
captions: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const liveCaptionsLimiter = rateLimit({
|
||||||
|
windowMs: 10 * 60 * 1000,
|
||||||
|
limit: 6000,
|
||||||
|
standardHeaders: "draft-8",
|
||||||
|
legacyHeaders: false,
|
||||||
|
keyGenerator: (req) => {
|
||||||
|
const forwarded = req.headers["x-forwarded-for"]?.split(",")[0];
|
||||||
|
const ip = forwarded || req.ip || "";
|
||||||
|
return ip.includes(":") ? ip.split(":")[0] : ip;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
router.use(liveCaptionsLimiter);
|
||||||
|
|
||||||
|
const normalizeLang = (lang = "") => {
|
||||||
|
const value = String(lang || "").trim().toLowerCase();
|
||||||
|
if (!value) return "";
|
||||||
|
const base = value.split(",")[0].split("-")[0].trim();
|
||||||
|
return base || value;
|
||||||
|
};
|
||||||
|
|
||||||
|
const normalizeTranslations = (translations) => {
|
||||||
|
if (!translations || typeof translations !== "object" || Array.isArray(translations)) return {};
|
||||||
|
const normalized = {};
|
||||||
|
for (const [langKey, translatedText] of Object.entries(translations)) {
|
||||||
|
const lang = normalizeLang(langKey);
|
||||||
|
const text = typeof translatedText === "string" ? translatedText.trim() : "";
|
||||||
|
if (!lang || !text) continue;
|
||||||
|
normalized[lang] = text;
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
};
|
||||||
|
|
||||||
|
const readText = (value) => {
|
||||||
|
if (typeof value === "string") return value.trim();
|
||||||
|
return "";
|
||||||
|
};
|
||||||
|
|
||||||
|
const extractDraftText = (body = {}) => {
|
||||||
|
const directDraft = readText(body?.draft);
|
||||||
|
if (directDraft) return directDraft;
|
||||||
|
const nestedDraft = readText(body?.draft?.text);
|
||||||
|
if (nestedDraft) return nestedDraft;
|
||||||
|
const fallbackText = readText(body?.text);
|
||||||
|
if (fallbackText) return fallbackText;
|
||||||
|
return "";
|
||||||
|
};
|
||||||
|
|
||||||
|
const buildTranslationsFromFlatPayload = (payload) => {
|
||||||
|
const ignoredKeys = new Set(["original", "draft", "sourceLang", "lang", "isDraft", "status", "translations"]);
|
||||||
|
const normalized = {};
|
||||||
|
for (const [key, value] of Object.entries(payload || {})) {
|
||||||
|
if (ignoredKeys.has(key)) continue;
|
||||||
|
const lang = normalizeLang(key);
|
||||||
|
const text = typeof value === "string" ? value.trim() : "";
|
||||||
|
if (!lang || !text) continue;
|
||||||
|
normalized[lang] = text;
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
};
|
||||||
|
|
||||||
|
const inferSourceLangFromTranslations = (original, translations) => {
|
||||||
|
const normalizedOriginal = String(original || "").trim();
|
||||||
|
if (!normalizedOriginal) return "original";
|
||||||
|
for (const [lang, text] of Object.entries(translations || {})) {
|
||||||
|
if (String(text || "").trim() === normalizedOriginal) return normalizeLang(lang);
|
||||||
|
}
|
||||||
|
return "original";
|
||||||
|
};
|
||||||
|
|
||||||
|
const getAvailableLanguages = () => {
|
||||||
|
const langs = new Set();
|
||||||
|
for (const caption of liveCaptionState.captions) {
|
||||||
|
Object.keys(caption || {}).forEach((key) => {
|
||||||
|
if (CAPTION_META_KEYS.has(key)) return;
|
||||||
|
const lang = normalizeLang(key);
|
||||||
|
if (lang) langs.add(lang);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return Array.from(langs).filter(Boolean).sort();
|
||||||
|
};
|
||||||
|
|
||||||
|
const resetLiveCaptionState = () => {
|
||||||
|
liveCaptionState.startedAt = Date.now();
|
||||||
|
liveCaptionState.lastIngestAt = 0;
|
||||||
|
liveCaptionState.latestSequence = 0;
|
||||||
|
liveCaptionState.captions = [];
|
||||||
|
};
|
||||||
|
|
||||||
|
const maybeResetForInactivity = () => {
|
||||||
|
if (!liveCaptionState.lastIngestAt) return;
|
||||||
|
if ((Date.now() - liveCaptionState.lastIngestAt) < INACTIVITY_RESET_MS) return;
|
||||||
|
resetLiveCaptionState();
|
||||||
|
};
|
||||||
|
|
||||||
|
router.get("/stream", async (req, res) => {
|
||||||
|
try {
|
||||||
|
maybeResetForInactivity();
|
||||||
|
const sinceSequence = Number.parseInt(req.query?.sinceSequence, 10);
|
||||||
|
const requestedLimit = Number.parseInt(req.query?.limit, 10);
|
||||||
|
const initialLimit = Number.isFinite(requestedLimit)
|
||||||
|
? Math.max(1, Math.min(requestedLimit, MAX_INITIAL_LIMIT))
|
||||||
|
: DEFAULT_INITIAL_LIMIT;
|
||||||
|
|
||||||
|
let captions = [];
|
||||||
|
if (Number.isFinite(sinceSequence) && sinceSequence >= 0) {
|
||||||
|
captions = liveCaptionState.captions.filter((item) => item.sequence > sinceSequence);
|
||||||
|
} else {
|
||||||
|
captions = liveCaptionState.captions.slice(-initialLimit);
|
||||||
|
}
|
||||||
|
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
latestSequence: liveCaptionState.latestSequence,
|
||||||
|
startedAt: new Date(liveCaptionState.startedAt).toISOString(),
|
||||||
|
availableLanguages: getAvailableLanguages(),
|
||||||
|
captions,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error getting live captions stream", error);
|
||||||
|
return res.status(500).json({
|
||||||
|
status: "Internal server error",
|
||||||
|
latestSequence: liveCaptionState.latestSequence,
|
||||||
|
captions: [],
|
||||||
|
availableLanguages: [],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post("/ingest", async (req, res) => {
|
||||||
|
try {
|
||||||
|
// TODO: Add basic auth/API key validation before production roll-out.
|
||||||
|
const draft = extractDraftText(req.body || {});
|
||||||
|
const originalFromPayload = readText(req.body?.original);
|
||||||
|
const original = originalFromPayload || draft;
|
||||||
|
const requestedLang = normalizeLang(req.body?.lang);
|
||||||
|
const sourceLangFromRequest = normalizeLang(req.body?.sourceLang || (requestedLang && requestedLang !== "draft" ? requestedLang : ""));
|
||||||
|
const isDraft = !!draft || requestedLang === "draft" || sourceLangFromRequest === "draft" || req.body?.isDraft === true || req.body?.status === "draft";
|
||||||
|
const mapFromNested = normalizeTranslations(req.body?.translations);
|
||||||
|
const mapFromFlat = buildTranslationsFromFlatPayload(req.body);
|
||||||
|
const translations = isDraft ? {} : { ...mapFromNested, ...mapFromFlat };
|
||||||
|
const inferredSource = inferSourceLangFromTranslations(original, translations);
|
||||||
|
const sourceLang = isDraft ? "" : (sourceLangFromRequest || inferredSource);
|
||||||
|
|
||||||
|
if (!original) {
|
||||||
|
return res.status(400).json({ status: "Original text is required" });
|
||||||
|
}
|
||||||
|
if (sourceLang && sourceLang !== "original" && sourceLang !== "draft" && !translations[sourceLang]) {
|
||||||
|
translations[sourceLang] = original;
|
||||||
|
}
|
||||||
|
|
||||||
|
const sequence = liveCaptionState.latestSequence + 1;
|
||||||
|
const caption = {
|
||||||
|
sequence,
|
||||||
|
createdAt: new Date().toISOString(),
|
||||||
|
original,
|
||||||
|
sourceLang: sourceLang || undefined,
|
||||||
|
lang: isDraft ? "draft" : (sourceLang || undefined),
|
||||||
|
isDraft,
|
||||||
|
status: isDraft ? "draft" : "final",
|
||||||
|
...translations,
|
||||||
|
};
|
||||||
|
|
||||||
|
liveCaptionState.latestSequence = sequence;
|
||||||
|
liveCaptionState.lastIngestAt = Date.now();
|
||||||
|
liveCaptionState.captions.push(caption);
|
||||||
|
if (liveCaptionState.captions.length > MAX_BUFFER_SIZE) {
|
||||||
|
liveCaptionState.captions.splice(0, liveCaptionState.captions.length - MAX_BUFFER_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
caption,
|
||||||
|
latestSequence: liveCaptionState.latestSequence,
|
||||||
|
availableLanguages: getAvailableLanguages(),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error ingesting live captions", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post("/reset", async (_, res) => {
|
||||||
|
try {
|
||||||
|
// TODO: Add admin authorization before exposing this endpoint.
|
||||||
|
resetLiveCaptionState();
|
||||||
|
return res.json({ status: "ok" });
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error resetting live captions state", error);
|
||||||
|
return res.status(500).json({ status: "Internal server error" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.get("/public/stream", async (req, res) => {
|
||||||
|
try {
|
||||||
|
maybeResetForInactivity();
|
||||||
|
const sinceSequence = Number.parseInt(req.query?.sinceSequence, 10);
|
||||||
|
const requestedLimit = Number.parseInt(req.query?.limit, 10);
|
||||||
|
const initialLimit = Number.isFinite(requestedLimit)
|
||||||
|
? Math.max(1, Math.min(requestedLimit, MAX_INITIAL_LIMIT))
|
||||||
|
: DEFAULT_INITIAL_LIMIT;
|
||||||
|
|
||||||
|
let captions = [];
|
||||||
|
if (Number.isFinite(sinceSequence) && sinceSequence >= 0) {
|
||||||
|
captions = liveCaptionState.captions.filter((item) => item.sequence > sinceSequence);
|
||||||
|
} else {
|
||||||
|
captions = liveCaptionState.captions.slice(-initialLimit);
|
||||||
|
}
|
||||||
|
|
||||||
|
return res.json({
|
||||||
|
status: "ok",
|
||||||
|
latestSequence: liveCaptionState.latestSequence,
|
||||||
|
startedAt: new Date(liveCaptionState.startedAt).toISOString(),
|
||||||
|
availableLanguages: getAvailableLanguages(),
|
||||||
|
captions,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error getting public live captions stream", error);
|
||||||
|
return res.status(500).json({
|
||||||
|
status: "Internal server error",
|
||||||
|
latestSequence: liveCaptionState.latestSequence,
|
||||||
|
captions: [],
|
||||||
|
availableLanguages: [],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -4,6 +4,7 @@ var router = express.Router();
|
|||||||
const DB = require("./../mongoDB.js");
|
const DB = require("./../mongoDB.js");
|
||||||
const Post = require("./../def/post.js");
|
const Post = require("./../def/post.js");
|
||||||
const Notifications = require("./../notifications.js");
|
const Notifications = require("./../notifications.js");
|
||||||
|
const { translateText, normalizeLanguageCode } = require("../utils/chatTranslation.js");
|
||||||
|
|
||||||
DB.getDB.then((DB) => {
|
DB.getDB.then((DB) => {
|
||||||
|
|
||||||
@@ -481,6 +482,47 @@ DB.getDB.then((DB) => {
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
router.post("/translate", async (req, res) => {
|
||||||
|
let postid = req.body.postid;
|
||||||
|
let targetLang = normalizeLanguageCode(req.body.targetLang);
|
||||||
|
|
||||||
|
// Return ack immediately
|
||||||
|
res.json({ status: "ok", message: "Translation queued" });
|
||||||
|
|
||||||
|
if (!postid || !targetLang) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Get post
|
||||||
|
const posts = await DB.getPostsByTag('', null); // No good way to get one post by ID directly exposed?
|
||||||
|
// Let's use dbCols directly if needed or find it. Wait, how do we get a single post?
|
||||||
|
// I'll assume DB.getPost exists, let me check that later. Actually I will use DB.postCols directly.
|
||||||
|
const post = await DB.postCols.findOne({ _id: DB.ObjectID(postid) });
|
||||||
|
if (!post || !post.content) return;
|
||||||
|
|
||||||
|
// Strip inline tags and bible tags before translating to reduce token usage and confusion,
|
||||||
|
// or just translate the raw content and let the AI handle it? The chat translator prompt says:
|
||||||
|
// "You translate chat messages. Keep meaning, tone, emojis, names, and references. Return only the translated text."
|
||||||
|
// So it can handle tags.
|
||||||
|
|
||||||
|
// To avoid huge translations or mostly-media posts
|
||||||
|
if (post.content.length > 1000) return;
|
||||||
|
|
||||||
|
if (post.translations && post.translations[targetLang]) return;
|
||||||
|
|
||||||
|
const translation = await translateText({
|
||||||
|
text: post.content,
|
||||||
|
sourceLang: "auto",
|
||||||
|
targetLang: targetLang
|
||||||
|
});
|
||||||
|
|
||||||
|
if (translation && translation.translatedText) {
|
||||||
|
await DB.addTranslation(postid, targetLang, translation.translatedText);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error in background post translation", error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @swagger
|
* @swagger
|
||||||
* /post/react:
|
* /post/react:
|
||||||
|
|||||||
@@ -760,16 +760,48 @@ DB.getDB.then((DB) => {
|
|||||||
* type: string
|
* type: string
|
||||||
*/
|
*/
|
||||||
router.post("/myProfile", async (req, res) => {
|
router.post("/myProfile", async (req, res) => {
|
||||||
let profile = {
|
try {
|
||||||
userid: getUserId(req),
|
let profile = {
|
||||||
profile: req.body.profile,
|
userid: getUserId(req),
|
||||||
data: req.body.data
|
profile: req.body.profile,
|
||||||
};
|
data: req.body.data
|
||||||
let profileObj = new Profile(profile); //validates profile
|
};
|
||||||
DB.updateProfile(getProfileId(req), profileObj);
|
let profileObj = new Profile(profile); //validates profile
|
||||||
return res.json({
|
const updateRes = await DB.updateProfile(getProfileId(req), profileObj);
|
||||||
status: "ok"
|
if (!updateRes || !updateRes.matchedCount) {
|
||||||
});
|
return res.status(400).json({
|
||||||
|
status: "Could not update profile"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return res.json({
|
||||||
|
status: "ok"
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error updating myProfile", error);
|
||||||
|
return res.status(500).json({
|
||||||
|
status: "Internal server error"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post("/notifications/viewed", async (req, res) => {
|
||||||
|
try {
|
||||||
|
const profileid = getProfileId(req);
|
||||||
|
const result = await DB.markNotificationsViewed(profileid);
|
||||||
|
if (!result) {
|
||||||
|
return res.status(400).json({
|
||||||
|
status: "Could not update notifications"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return res.json({
|
||||||
|
status: "ok"
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error marking notifications as viewed", error);
|
||||||
|
return res.status(500).json({
|
||||||
|
status: "Internal server error"
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
89
scripts/liveCaptionsTestSender.js
Normal file
89
scripts/liveCaptionsTestSender.js
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
require("dotenv").config();
|
||||||
|
const axios = require("axios");
|
||||||
|
|
||||||
|
const baseUrl = (process.env.CAPTION_TEST_BASE_URL || process.env.BASE_URL || "http://localhost:3000").replace(/\/+$/, "");
|
||||||
|
const ingestUrl = `${baseUrl}/live-captions/ingest`;
|
||||||
|
const intervalMs = 6000;
|
||||||
|
|
||||||
|
const samples = [
|
||||||
|
{
|
||||||
|
original: "Bienvenidos a nuestro servicio de adoracion.",
|
||||||
|
es: "Bienvenidos a nuestro servicio de adoracion.",
|
||||||
|
en: "Welcome to our worship service.",
|
||||||
|
fr: "Bienvenue a notre service de louange.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
original: "Leamos juntos en el Salmo 23.",
|
||||||
|
es: "Leamos juntos en el Salmo 23.",
|
||||||
|
en: "Let us read together in Psalm 23.",
|
||||||
|
fr: "Lisons ensemble le Psaume 23.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
original: "Dios es fiel en todo tiempo.",
|
||||||
|
es: "Dios es fiel en todo tiempo.",
|
||||||
|
en: "God is faithful at all times.",
|
||||||
|
fr: "Dieu est fidele en tout temps.",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
original: "Tomemos un momento para orar.",
|
||||||
|
es: "Tomemos un momento para orar.",
|
||||||
|
en: "Let us take a moment to pray.",
|
||||||
|
fr: "Prenons un moment pour prier.",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
let sampleIndex = 0;
|
||||||
|
let timer = null;
|
||||||
|
|
||||||
|
const postPayload = async (payload) => {
|
||||||
|
const kind = payload?.draft ? "draft" : "final";
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await axios.post(ingestUrl, payload, {
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
timeout: 10000,
|
||||||
|
});
|
||||||
|
const seq = response?.data?.caption?.sequence || response?.data?.latestSequence || "?";
|
||||||
|
const text = payload?.draft || payload?.original || "";
|
||||||
|
console.log(`[live-captions:test-sender] sent ${kind} sequence=${seq} text="${text}"`);
|
||||||
|
} catch (error) {
|
||||||
|
const status = error?.response?.status;
|
||||||
|
const body = error?.response?.data;
|
||||||
|
const message = error?.message || "request failed";
|
||||||
|
console.error("[live-captions:test-sender] send failed", { status, body, message });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const sendNextSample = async () => {
|
||||||
|
const payload = samples[sampleIndex];
|
||||||
|
|
||||||
|
const draftWords = String(payload?.original || "").split(" ").filter(Boolean);
|
||||||
|
if (draftWords.length > 2) {
|
||||||
|
await postPayload({ draft: draftWords.slice(0, 2).join(" ") });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 550));
|
||||||
|
await postPayload({ draft: draftWords.slice(0, 4).join(" ") });
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 550));
|
||||||
|
}
|
||||||
|
|
||||||
|
await postPayload(payload);
|
||||||
|
sampleIndex = (sampleIndex + 1) % samples.length;
|
||||||
|
};
|
||||||
|
|
||||||
|
const start = async () => {
|
||||||
|
console.log(`[live-captions:test-sender] posting to ${ingestUrl} every ${intervalMs / 1000}s`);
|
||||||
|
await sendNextSample();
|
||||||
|
timer = setInterval(sendNextSample, intervalMs);
|
||||||
|
};
|
||||||
|
|
||||||
|
const shutdown = () => {
|
||||||
|
if (timer) clearInterval(timer);
|
||||||
|
console.log("[live-captions:test-sender] stopped");
|
||||||
|
process.exit(0);
|
||||||
|
};
|
||||||
|
|
||||||
|
process.on("SIGINT", shutdown);
|
||||||
|
process.on("SIGTERM", shutdown);
|
||||||
|
|
||||||
|
start();
|
||||||
97
utils/chatTranslation.js
Normal file
97
utils/chatTranslation.js
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
const axios = require("axios");
|
||||||
|
|
||||||
|
const DEFAULT_MODEL = process.env.OPENAI_TRANSLATION_MODEL || process.env.OPENAI_MODEL || "gpt-4o-mini";
|
||||||
|
|
||||||
|
const normalizeLanguageCode = (rawLanguage) => {
|
||||||
|
if (!rawLanguage || typeof rawLanguage !== "string") return "en";
|
||||||
|
const firstValue = rawLanguage.split(",")[0].trim().toLowerCase();
|
||||||
|
if (!firstValue) return "en";
|
||||||
|
const noQuality = firstValue.split(";")[0].trim();
|
||||||
|
const shortCode = noQuality.split("-")[0].trim();
|
||||||
|
return shortCode || "en";
|
||||||
|
};
|
||||||
|
|
||||||
|
const extractOutputText = (data) => {
|
||||||
|
if (!data) return "";
|
||||||
|
if (typeof data.output_text === "string" && data.output_text.trim()) {
|
||||||
|
return data.output_text.trim();
|
||||||
|
}
|
||||||
|
if (!Array.isArray(data.output)) return "";
|
||||||
|
const chunks = [];
|
||||||
|
data.output.forEach((item) => {
|
||||||
|
if (!Array.isArray(item?.content)) return;
|
||||||
|
item.content.forEach((entry) => {
|
||||||
|
if (entry?.type === "output_text" && typeof entry?.text === "string") {
|
||||||
|
chunks.push(entry.text);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return chunks.join("\n").trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
const translateText = async ({ text, sourceLang, targetLang }) => {
|
||||||
|
const normalizedSource = normalizeLanguageCode(sourceLang);
|
||||||
|
const normalizedTarget = normalizeLanguageCode(targetLang);
|
||||||
|
if (!text || !normalizedTarget || normalizedSource === normalizedTarget) {
|
||||||
|
return {
|
||||||
|
translatedText: text,
|
||||||
|
provider: "none",
|
||||||
|
model: "none",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiKey = process.env.OPENAI_API_KEY;
|
||||||
|
if (!apiKey) return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await axios.post(
|
||||||
|
"https://api.openai.com/v1/responses",
|
||||||
|
{
|
||||||
|
model: DEFAULT_MODEL,
|
||||||
|
input: [
|
||||||
|
{
|
||||||
|
role: "system",
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: "input_text",
|
||||||
|
text: "You translate chat messages and posts. Keep meaning, tone, emojis, names, and references. Do not translate structural tags starting with @ (e.g. @image:..., @youtube:..., @bible:...). Leave them exactly as they are or omit them if they do not fit the text flow. Return only the translated text.",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
role: "user",
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
type: "input_text",
|
||||||
|
text: `Translate this message from ${normalizedSource} to ${normalizedTarget}:\n\n${text}`,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timeout: 15000,
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${apiKey}`,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const translatedText = extractOutputText(response?.data);
|
||||||
|
if (!translatedText) return null;
|
||||||
|
return {
|
||||||
|
translatedText,
|
||||||
|
provider: "openai",
|
||||||
|
model: DEFAULT_MODEL,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error translating chat message", error?.response?.data || error?.message || error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
normalizeLanguageCode,
|
||||||
|
translateText,
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user