@overlaysymphony/twitch 0.3.4 → 0.4.0

package/src/eventsub/eventsub.ts

@@ -9,42 +9,60 @@ import { createSubscription } from "../helix/subscriptions/index.ts"
 import { type EventPayload, buildSubscription } from "./events-helpers.ts"
 import { type TwitchMessage } from "./messages.ts"
 
-export type TwitchEventSub = Events<EventPayload>
+export type TwitchEventSub = Events<EventPayload> & {
+  targetUserId: string
+}
 
+// TODO: connection instead of authentication
 export default async function createEventSub(
   authentication: Authentication,
+  targetUserId?: string,
 ): Promise<TwitchEventSub> {
-  return createEvents<EventPayload, string>(
-    async (pubsub) => {
-      const socket = new WebSocket("wss://eventsub.wss.twitch.tv/ws")
-
-      const { promise, resolve } = createDefer<string>()
-      socket.addEventListener("message", ({ data: rawData }) => {
-        const data = JSON.parse(rawData as string) as TwitchMessage
-        data.type = data.metadata.message_type
-
-        if (data.type === "session_welcome") {
-          resolve(data.payload.session.id)
-          return
-        }
-
-        if (data.type === "notification") {
-          data.payload.id = data.metadata.message_id
-          data.payload.type = data.payload.subscription.type
-
-          pubsub.dispatch(data.payload)
-          return
-        }
-      })
-
-      return await promise
-    },
-    async (pubsub, sessionId, type) => {
-      await createSubscription(
-        authentication,
-        { method: "websocket", session_id: sessionId },
-        buildSubscription(type, authentication.user.id),
-      )
-    },
-  )
+  const currentUserId = authentication.user.id
+  targetUserId ??= currentUserId
+
+  return {
+    targetUserId,
+    ...(await createEvents<EventPayload, string>(
+      async (pubsub) => {
+        const socket = new WebSocket("wss://eventsub.wss.twitch.tv/ws")
+
+        const { promise, resolve } = createDefer<string>()
+        socket.addEventListener("message", ({ data: rawData }) => {
+          const data = JSON.parse(rawData as string) as TwitchMessage
+          data.type = data.metadata.message_type
+
+          if (data.type === "session_welcome") {
+            resolve(data.payload.session.id)
+            return
+          }
+
+          if (data.type === "notification") {
+            data.payload.id = data.metadata.message_id
+            data.payload.type = data.payload.subscription.type
+
+            pubsub.dispatch(data.payload)
+            return
+          }
+        })
+
+        return await promise
+      },
+      async (pubsub, sessionId, type) => {
+        await createSubscription(
+          authentication,
+          { method: "websocket", session_id: sessionId },
+          buildSubscription(type, currentUserId, targetUserId),
+        )
+      },
+      (type) => {
+        const subscription = buildSubscription(
+          type,
+          currentUserId,
+          targetUserId,
+        )
+        return `${type}-${JSON.stringify(subscription)}`
+      },
+    )),
+  }
 }

package/src/eventsub/index.ts

@@ -1,6 +1,7 @@
 export {
   type EventConfig,
   type EventConfigs,
+  type EventPayload,
   type EventType,
   registerEvent,
 } from "./events-helpers.ts"

package/src/helix/index.ts

@@ -0,0 +1 @@
+export { helix as default } from "./helix.ts"

package/src/helix/users/users.ts

@@ -52,6 +52,35 @@ export async function getUser(
   }
 }
 
+export async function getUsers(
+  authentication: Authentication,
+  login?: string | string[],
+  id?: string | string[],
+): Promise<TwitchUser[] | undefined> {
+  if (!login && !id) return undefined
+
+  if (typeof login === "string" && login.startsWith("@")) {
+    login = login.slice(1)
+  }
+
+  const { data: users } = await helix<
+    UsersResponse,
+    { id?: string | string[]; login?: string | string[] }
+  >(authentication, {
+    method: "GET",
+    path: "/users",
+    params: {
+      id,
+      login,
+    },
+  })
+
+  return users.map(({ created_at, ...user }) => ({
+    ...user,
+    created_at: new Date(created_at),
+  }))
+}
+
 export async function getCurrentUser(
   authentication: Authentication,
 ): Promise<TwitchUser | undefined> {

package/src/helpers/alerts/alerts.ts

@@ -24,8 +24,8 @@ export const mapTypeToPriority = {
 export function onAlert(
   eventsub: TwitchEventSub,
   handleAlert: (alert: Alert) => void,
-): void {
-  eventsub.on(
+): () => void {
+  return eventsub.on(
     [
       "channel.cheer",
       "channel.follow",

package/src/helpers/charity/charity.ts

@@ -31,7 +31,7 @@ export function onCharity(
     trigger: "progress" | "start" | "stop",
   ) => void,
   handleDonation: (donation: CharityDonation, charity: Charity) => void,
-): void {
+): () => void {
   const charity: Charity = {
     name: "",
     description: "",
@@ -42,7 +42,7 @@ export function onCharity(
     targetAmount: 0,
   }
 
-  eventsub.on(
+  return eventsub.on(
     [
       "channel.charity_campaign.start",
       "channel.charity_campaign.progress",

package/src/helpers/goal/goal.ts

@@ -16,7 +16,7 @@ const mapTypeToTrigger = {
 export function onGoal(
   eventsub: TwitchEventSub,
   handleGoal: (goal: Goal, trigger: "begin" | "progress" | "end") => void,
-): void {
+): () => void {
   const goal: Goal = {
     type: "",
     description: "",
@@ -24,7 +24,7 @@ export function onGoal(
     targetAmount: 0,
   }
 
-  eventsub.on(
+  return eventsub.on(
     ["channel.goal.begin", "channel.goal.progress", "channel.goal.end"],
     (payload) => {
       goal.type = payload.event.type

package/src/helpers/hype-train/hype-train.ts

@@ -19,7 +19,7 @@ export function onHypeTrain(
     hypeTrain: HypeTrain,
     trigger: "begin" | "progress" | "end",
   ) => void,
-): void {
+): () => void {
   const hypeTrain: HypeTrain = {
     level: 0,
     total: 0,
@@ -27,7 +27,7 @@ export function onHypeTrain(
     goal: 0,
   }
 
-  eventsub.on(
+  return eventsub.on(
     [
       "channel.hype_train.begin",
       "channel.hype_train.progress",

package/src/helpers/poll/poll.ts

@@ -23,7 +23,7 @@ const mapTypeToTrigger = {
 export function onPoll(
   eventsub: TwitchEventSub,
   handlePoll: (poll: Poll, trigger: "begin" | "progress" | "end") => void,
-): void {
+): () => void {
   const poll: Poll = {
     id: "",
     title: "",
@@ -31,7 +31,7 @@ export function onPoll(
     endsAt: undefined,
   }
 
-  eventsub.on(
+  return eventsub.on(
     ["channel.poll.begin", "channel.poll.progress", "channel.poll.end"],
     (payload) => {
       // Twitch sometimes sends duplicate end events.

package/src/helpers/prediction/prediction.ts

@@ -25,14 +25,14 @@ export function onPrediction(
     prediction: Prediction,
     trigger: "begin" | "progress" | "lock" | "end",
   ) => void,
-): void {
+): () => void {
   const prediction: Prediction = {
     title: "",
     outcomes: [],
     locksAt: new Date(""),
   }
 
-  eventsub.on(
+  return eventsub.on(
     [
       "channel.prediction.begin",
       "channel.prediction.progress",

package/src/helpers/redemption/redemption.ts

@@ -29,7 +29,7 @@ export function onRedemption(
   ...config:
     | [string, (redemption: Redemption) => void]
     | [(redemption: Redemption) => void]
-): void {
+): () => void {
   const id = typeof config[0] === "string" ? config[0] : undefined
   const handleRedemption =
     typeof config[0] === "function"
@@ -38,7 +38,7 @@ export function onRedemption(
         ? config[1]
         : undefined
 
-  eventsub.on(
+  return eventsub.on(
     ["channel.channel_points_custom_reward_redemption.add"],
     (payload) => {
       if (typeof id === "undefined" || payload.event.reward.id === id) {

package/src/helpers/status/status.ts

@@ -13,7 +13,7 @@ export interface Status {
 export function onStatus(
   eventsub: TwitchEventSub,
   handleStatus: (status: Status) => void,
-): void {
+): () => void {
   const status: Status = {
     online: false,
     shieldMode: false,
@@ -22,7 +22,7 @@ export function onStatus(
     labels: [],
   }
 
-  eventsub.on(
+  return eventsub.on(
     [
       "channel.update",
       "stream.online",