This commit is contained in:
2026-04-23 04:49:00 +02:00
parent b1b3152d9b
commit 12baf6a12b
13 changed files with 159 additions and 118 deletions

3
.gitignore vendored
View File

@@ -141,3 +141,6 @@ dist
vite.config.js.timestamp-* vite.config.js.timestamp-*
vite.config.ts.timestamp-* vite.config.ts.timestamp-*
.vite/ .vite/
token.json

View File

@@ -3,14 +3,5 @@ require("dotenv").config();
module.exports = { module.exports = {
clientId: process.env.CLIENT_ID, clientId: process.env.CLIENT_ID,
clientSecret: process.env.CLIENT_SECRET, clientSecret: process.env.CLIENT_SECRET,
broadcasterId: process.env.BROADCASTER_ID, broadcasterId: process.env.BROADCASTER_ID,
// THIS becomes your USER token after login
token: null,
rewards: {
HYDRATE: process.env.REWARD_HYDRATE_ID,
SOUND: process.env.REWARD_SOUND_ID,
},
}; };

View File

@@ -1,20 +1,21 @@
const { startAuthServer } = require("./twitch/authServer"); const { startAuthServer } = require("./twitch/authServer");
const { connect } = require("./twitch/websocket"); const { connect } = require("./twitch/websocket");
const { initFromDisk } = require("./twitch/token");
const auth = startAuthServer(); const restored = initFromDisk();
// wait for login before starting Twitch connection if (restored) {
const wait = setInterval(() => { console.log("🚀 Using saved token, skipping login...");
const token = auth.getToken(); connect();
} else {
const auth = startAuthServer();
const wait = setInterval(() => {
const token = auth.getToken();
if (!token) return;
if (token) {
clearInterval(wait); clearInterval(wait);
// inject token into runtime config
const config = require("./config");
config.token = token;
console.log("🚀 Starting Twitch connection...");
connect(); connect();
} }, 1000);
}, 1000); }

View File

@@ -1,6 +1,6 @@
module.exports = { module.exports = {
name: "Hydrate", name: "Hydrate",
run: (event) => { run: (event) => {
console.log("💧 Hydration triggered for", event.user_name); console.log("💧 Hydrate triggered:", event.user_name);
} },
}; };

View File

@@ -1,29 +1,26 @@
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
const rewards = new Map(); const rewardMap = new Map();
function loadRewards() { function loadRewards() {
const files = fs.readdirSync(__dirname); const files = fs.readdirSync(__dirname);
for (const file of files) { for (const file of files) {
if (file === "index.js") continue; if (file === "index.js") continue;
if (!file.endsWith(".js")) continue;
const reward = require(path.join(__dirname, file)); const reward = require(path.join(__dirname, file));
if (!reward.name || !reward.run) { rewardMap.set(reward.name.toLowerCase(), reward.run);
console.warn(`⚠️ Invalid reward file: ${file}`);
continue;
}
rewards.set(reward.name.toLowerCase(), reward.run);
console.log(`📦 Loaded reward: ${reward.name}`); console.log(`📦 Loaded reward: ${reward.name}`);
} }
} }
function getReward(name) { function getReward(name) {
return rewards.get(name.toLowerCase()); return rewardMap.get(name.toLowerCase());
} }
module.exports = { loadRewards, getReward }; loadRewards();
module.exports = { getReward };

View File

@@ -1,6 +1,6 @@
module.exports = { module.exports = {
name: "Sound", name: "Sound",
run: (event) => { run: (event) => {
console.log("🔊 Sound triggered for", event.user_name); console.log("🔊 Sound triggered:", event.user_name);
} },
}; };

View File

@@ -1,8 +1,11 @@
const http = require("http"); const http = require("http");
const axios = require("axios"); const axios = require("axios");
const config = require("../config"); const config = require("../config");
const { setTokens, startAutoRefresh } = require("./token");
const { setTokens, startAutoRefresh } = require("./token");
const { saveTokenData } = require("./tokenStore");
let accessToken = null;
let authServerStarted = false; let authServerStarted = false;
function startAuthServer() { function startAuthServer() {
@@ -12,54 +15,62 @@ function startAuthServer() {
const server = http.createServer(async (req, res) => { const server = http.createServer(async (req, res) => {
const url = new URL(req.url, "http://localhost:3000"); const url = new URL(req.url, "http://localhost:3000");
// OAuth callback endpoint if (url.pathname !== "/callback") return;
if (url.pathname === "/callback") {
const code = url.searchParams.get("code");
if (!code) { const code = url.searchParams.get("code");
res.writeHead(400);
res.end("Missing OAuth code");
return;
}
try { if (!code) {
// Exchange code for tokens res.writeHead(400);
const tokenRes = await axios.post( res.end("Missing OAuth code");
"https://id.twitch.tv/oauth2/token", return;
null, }
{
params: {
client_id: config.clientId,
client_secret: config.clientSecret,
code,
grant_type: "authorization_code",
redirect_uri: "http://localhost:3000/callback",
},
}
);
const accessToken = tokenRes.data.access_token; try {
const refreshToken = tokenRes.data.refresh_token; // Exchange code for tokens
const expiresIn = tokenRes.data.expires_in; const tokenRes = await axios.post(
"https://id.twitch.tv/oauth2/token",
null,
{
params: {
client_id: config.clientId,
client_secret: config.clientSecret,
code,
grant_type: "authorization_code",
redirect_uri: "http://localhost:3000/callback",
},
}
);
// Store tokens globally in auth system const access = tokenRes.data.access_token;
setTokens(accessToken, refreshToken); const refresh = tokenRes.data.refresh_token;
// Start auto-refresh loop // Update runtime token system
startAutoRefresh(); setTokens(access, refresh);
startAutoRefresh();
console.log("🔐 Twitch authentication successful"); // Persist to disk
console.log(`⏱ Token expires in: ${expiresIn}s`); saveTokenData({
accessToken: access,
refreshToken: refresh,
savedAt: Date.now(),
});
res.writeHead(200, { "Content-Type": "text/plain" }); accessToken = access;
res.end("Authentication successful. You can close this window.");
} catch (err) { console.log("🔐 Twitch authentication successful");
console.error("OAuth token exchange failed:", err.response?.data || err.message); console.log("💾 Tokens saved to disk");
res.writeHead(500); res.writeHead(200, { "Content-Type": "text/plain" });
res.end("Authentication failed. Check terminal logs."); res.end("Authentication successful. You can close this tab.");
}
} catch (err) {
console.error(
"OAuth token exchange failed:",
err.response?.data || err.message
);
res.writeHead(500);
res.end("Authentication failed. Check terminal logs.");
} }
}); });
@@ -71,9 +82,13 @@ function startAuthServer() {
`&response_type=code` + `&response_type=code` +
`&scope=channel:read:redemptions`; `&scope=channel:read:redemptions`;
console.log("\n👉 Twitch Login URL:"); console.log("\n👉 Twitch Login URL:\n");
console.log(authUrl + "\n"); console.log(authUrl + "\n");
}); });
return {
getToken: () => accessToken,
};
} }
module.exports = { startAuthServer }; module.exports = { startAuthServer };

View File

@@ -1,29 +1,20 @@
const { loadRewards, getReward } = require("../rewards"); const rewards = require("../rewards");
loadRewards();
function handleEvent(payload) { function handleEvent(payload) {
const { subscription, event } = payload; const event = payload.event;
if (
subscription.type !==
"channel.channel_points_custom_reward_redemption.add"
) {
return;
}
const rewardName = event.reward.title; const rewardName = event.reward.title;
console.log(`🎁 ${event.user_name}${rewardName}`); console.log(`🎁 ${event.user_name}${rewardName}`);
const reward = getReward(rewardName); const handler = rewards.getReward(rewardName);
if (!reward) { if (!handler) {
console.log("Unknown reward:", rewardName); console.log("Unknown reward:", rewardName);
return; return;
} }
reward(event); handler(event);
} }
module.exports = { handleEvent }; module.exports = { handleEvent };

View File

@@ -0,0 +1,11 @@
const sessions = new Set();
function hasSession(id) {
return sessions.has(id);
}
function markSession(id) {
sessions.add(id);
}
module.exports = { hasSession, markSession };

View File

@@ -6,7 +6,7 @@ async function createSubscription(sessionId) {
try { try {
const token = getAccessToken(); const token = getAccessToken();
const res = await axios.post( await axios.post(
"https://api.twitch.tv/helix/eventsub/subscriptions", "https://api.twitch.tv/helix/eventsub/subscriptions",
{ {
type: "channel.channel_points_custom_reward_redemption.add", type: "channel.channel_points_custom_reward_redemption.add",
@@ -23,14 +23,13 @@ async function createSubscription(sessionId) {
headers: { headers: {
"Client-ID": config.clientId, "Client-ID": config.clientId,
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
"Content-Type": "application/json",
}, },
} }
); );
console.log("📡 Subscription created"); console.log("📡 Subscription created");
} catch (err) { } catch (e) {
console.error("❌ Subscription error:", err.response?.data || err.message); console.error("❌ Subscription error:", e.response?.data || e.message);
} }
} }

View File

@@ -1,15 +1,35 @@
const axios = require("axios"); const axios = require("axios");
const config = require("../config"); const config = require("../config");
const { saveTokenData, loadTokenData } = require("./tokenStore");
let accessToken = null; let accessToken = null;
let refreshToken = null; let refreshToken = null;
function setTokens(initialAccess, initialRefresh) { function initFromDisk() {
accessToken = initialAccess; const data = loadTokenData();
refreshToken = initialRefresh;
if (!data) return false;
accessToken = data.accessToken;
refreshToken = data.refreshToken;
console.log("💾 Loaded token from disk");
return true;
}
function setTokens(at, rt) {
accessToken = at;
refreshToken = rt;
saveTokenData({
accessToken,
refreshToken,
savedAt: Date.now(),
});
} }
function getAccessToken() { function getAccessToken() {
if (!accessToken) throw new Error("Token not ready");
return accessToken; return accessToken;
} }
@@ -29,16 +49,12 @@ async function refreshAccessToken() {
} }
); );
accessToken = res.data.access_token; setTokens(res.data.access_token, res.data.refresh_token);
refreshToken = res.data.refresh_token;
console.log("🔄 Twitch token refreshed"); console.log("🔄 Token refreshed + saved");
return accessToken;
} }
function startAutoRefresh() { function startAutoRefresh() {
// refresh every 3 hours (safe before expiry)
setInterval(() => { setInterval(() => {
refreshAccessToken().catch(console.error); refreshAccessToken().catch(console.error);
}, 3 * 60 * 60 * 1000); }, 3 * 60 * 60 * 1000);
@@ -47,6 +63,6 @@ function startAutoRefresh() {
module.exports = { module.exports = {
setTokens, setTokens,
getAccessToken, getAccessToken,
refreshAccessToken,
startAutoRefresh, startAutoRefresh,
initFromDisk,
}; };

23
src/twitch/tokenStore.js Normal file
View File

@@ -0,0 +1,23 @@
const fs = require("fs");
const path = require("path");
const FILE = path.join(__dirname, "../../token.json");
function saveTokenData(data) {
fs.writeFileSync(FILE, JSON.stringify(data, null, 2));
}
function loadTokenData() {
if (!fs.existsSync(FILE)) return null;
try {
return JSON.parse(fs.readFileSync(FILE, "utf-8"));
} catch (e) {
return null;
}
}
module.exports = {
saveTokenData,
loadTokenData,
};

View File

@@ -1,6 +1,7 @@
const WebSocket = require("ws"); const WebSocket = require("ws");
const { createSubscription } = require("./subscriptions");
const { handleEvent } = require("./handler"); const { handleEvent } = require("./handler");
const { createSubscription } = require("./subscriptions");
const { markSession, hasSession } = require("./subscriptionState");
let reconnectUrl = "wss://eventsub.wss.twitch.tv/ws"; let reconnectUrl = "wss://eventsub.wss.twitch.tv/ws";
@@ -19,13 +20,14 @@ function connect(url = reconnectUrl) {
case "session_welcome": { case "session_welcome": {
const sessionId = payload.session.id; const sessionId = payload.session.id;
console.log("🟢 Session:", sessionId); if (hasSession(sessionId)) return;
markSession(sessionId);
reconnectUrl = reconnectUrl =
payload.session.reconnect_url || payload.session.reconnect_url || reconnectUrl;
"wss://eventsub.wss.twitch.tv/ws";
console.log("🟢 Session:", sessionId);
// IMPORTANT: must be immediate
await createSubscription(sessionId); await createSubscription(sessionId);
break; break;
} }
@@ -35,12 +37,8 @@ function connect(url = reconnectUrl) {
break; break;
case "session_reconnect": case "session_reconnect":
console.log("♻️ Reconnecting...");
ws.close(); ws.close();
connect(payload?.session?.reconnect_url || reconnectUrl); connect(payload.session.reconnect_url);
break;
case "session_keepalive":
break; break;
} }
}); });
@@ -49,10 +47,6 @@ function connect(url = reconnectUrl) {
console.log("❌ Disconnected. Reconnecting..."); console.log("❌ Disconnected. Reconnecting...");
setTimeout(() => connect(), 3000); setTimeout(() => connect(), 3000);
}); });
ws.on("error", (err) => {
console.error("WebSocket error:", err.message);
});
} }
module.exports = { connect }; module.exports = { connect };