treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

th: more streaming "fixes"

main
kouhai dev 2024-02-18 02:32:29 -08:00
parent 236c9c61ce
commit 6853b68618
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
streaming/index.js
View File

@ -30,6 +30,14 @@ const dotenvFiles = ['.env', dotenvFile, '.env.local', dotenvFileLocal]
.map(s => path.join(projectDir, s));
dotenvFiles.forEach(path => dotenv.config({path}));
const subEnv = (s) => s.replaceAll(/\$\w+|\$\{\w+\}/g, (match) => {
const name = match.startsWith('${') ? match.slice(2, -1) : match.slice(1);
if (name === 'PWD') {
return projectDir;
}
return process.env[name];
});
if (process.env.REDIS_URL && process.env.PWD) {
process.env.REDIS_URL = process.env.REDIS_URL.replace(/\$PWD\b|$\{PWD\}/, projectDir);
}
@ -61,7 +69,7 @@ const createRedisClient = async (config) => {
if (!redisUrl) {
// @ts-ignore
client = new Redis(redisParams);
} else if (parsed.host === null && parsed.path[0] === '.') {
} else if (parsed.host === null && parsed?.path?.[0] === '.') {
redisParams.path = parsed.path;
// @ts-ignore
client = new Redis(redisParams);
@ -116,10 +124,7 @@ const parseJSON = (json, req) => {
*/
const pgConfigFromEnv = (env) => {
if (env.DB_HOST) {
env.DB_HOST = env.DB_HOST.replaceAll(/\$\w+|\$\{\w+\}/g, (match) => {
const name = match.startsWith('${') ? match.slice(2, -1) : match.slice(1);
return env[name];
});
env.DB_HOST = subEnv(env.DB_HOST);
}
const pgConfigs = {
development: {
@ -1113,10 +1118,12 @@ const startServer = async () => {
api.use(errorMiddleware);
api.get('/api/v1/streaming/*', (req, res) => {
console.log(req)
// @ts-ignore
channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
const onSend = streamToHttp(req, res);
const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
console.log(1)
// @ts-ignore
streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering, options.allowLocalOnly);