kasunk99-livestream-core 0.1.1 → 0.1.2

package/dist/hooks/useViewerSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useViewerSocket.d.ts","sourceRoot":"","sources":["../../src/hooks/useViewerSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAInD,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7D,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,6EAA6E;IAC7E,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAubpG"}
+{"version":3,"file":"useViewerSocket.d.ts","sourceRoot":"","sources":["../../src/hooks/useViewerSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAM,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAInD,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7D,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,6EAA6E;IAC7E,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,iBAAiB,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA+cpG"}

package/dist/hooks/useViewerSocket.js

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { io } from 'socket.io-client';
 import { getApiKey, getDisplayName } from '../config';
 import { ensureMediasoupGlobals } from '../services/mediasoup-init';
-import { getSignalingUrl } from '../services/livestream.service';
+import { getSignalingUrl, mintViewerToken } from '../services/livestream.service';
 /**
  * Connects to the livestream signaling server and joins a room as viewer.
  * When roomId changes, leaves the previous room and joins the new one (TikTok-style).
@@ -102,80 +102,105 @@ export function useViewerSocket(roomId) {
                 };
             });
         }, JOIN_TIMEOUT_MS);
-        const apiKey = getApiKey();
-        // Match web client (Client/src/streamService.js): websocket first, then polling.
-        const socket = io(signalingUrl, {
-            transports: ['websocket', 'polling'],
-            reconnection: true,
-            autoConnect: true,
-            timeout: 10000,
-            ...(apiKey
-                ? {
-                    auth: { apiKey },
-                    extraHeaders: { 'x-api-key': apiKey },
-                }
-                : {}),
-        });
-        socketRef.current = socket;
-        socket.on('connect', () => {
-            socket.emit('join-room', {
-                roomId,
-                role: 'viewer',
-                displayName,
-            }, (res) => {
+        let socket = null;
+        (async () => {
+            // Server requires viewerToken for viewers (not merchant apiKey).
+            // We mint a short-lived viewer token via HTTP using the apiKey.
+            const apiKey = getApiKey();
+            if (!apiKey) {
                 clearTimeout(joinTimeout);
-                if (roomIdRef.current !== roomId)
-                    return;
-                if (res?.error) {
+                setState((prev) => ({ ...prev, joining: false, joined: false, error: 'Livestream API key not configured' }));
+                return;
+            }
+            const tokenRes = await mintViewerToken({ roomId });
+            if (roomIdRef.current !== roomId)
+                return;
+            if ('error' in tokenRes) {
+                clearTimeout(joinTimeout);
+                setState((prev) => ({
+                    ...prev,
+                    joining: false,
+                    joined: false,
+                    error: tokenRes.error || 'Failed to mint viewer token',
+                }));
+                return;
+            }
+            // Match web client (Client/src/streamService.js): websocket first, then polling.
+            socket = io(signalingUrl, {
+                transports: ['websocket', 'polling'],
+                reconnection: true,
+                autoConnect: true,
+                timeout: 10000,
+                auth: { viewerToken: tokenRes.token },
+            });
+            socketRef.current = socket;
+            socket.on('connect', () => {
+                socket?.emit('join-room', {
+                    roomId,
+                    role: 'viewer',
+                    displayName,
+                }, (res) => {
+                    clearTimeout(joinTimeout);
+                    if (roomIdRef.current !== roomId)
+                        return;
+                    if (res?.error) {
+                        setState((prev) => ({
+                            ...prev,
+                            joining: false,
+                            joined: false,
+                            error: res.error ?? 'Failed to join',
+                        }));
+                        return;
+                    }
+                    const iceFromJoin = res.iceServers;
+                    if (Array.isArray(iceFromJoin) && iceFromJoin.length > 0) {
+                        iceServersRef.current = iceFromJoin;
+                    }
                     setState((prev) => ({
                         ...prev,
                         joining: false,
-                        joined: false,
-                        error: res.error ?? 'Failed to join',
+                        joined: true,
+                        producerList: res.producerList ?? [],
+                        roomState: res.roomState ?? null,
+                        rtpCapabilities: res.rtpCapabilities ?? null,
+                        error: null,
                     }));
-                    return;
-                }
-                const iceFromJoin = res.iceServers;
-                if (Array.isArray(iceFromJoin) && iceFromJoin.length > 0) {
-                    iceServersRef.current = iceFromJoin;
-                }
+                });
+            });
+            socket.on('connect_error', (err) => {
+                clearTimeout(joinTimeout);
                 setState((prev) => ({
                     ...prev,
                     joining: false,
-                    joined: true,
-                    producerList: res.producerList ?? [],
-                    roomState: res.roomState ?? null,
-                    rtpCapabilities: res.rtpCapabilities ?? null,
-                    error: null,
+                    joined: false,
+                    error: err?.message ?? 'Connection failed',
                 }));
             });
-        });
-        socket.on('connect_error', (err) => {
-            clearTimeout(joinTimeout);
-            setState((prev) => ({
-                ...prev,
-                joining: false,
-                joined: false,
-                error: err?.message ?? 'Connection failed',
-            }));
-        });
-        socket.on('ice-servers', (servers) => {
-            iceServersRef.current = Array.isArray(servers) ? servers : [];
-        });
-        socket.on('room-updated', (payload) => {
-            if (payload?.producerList) {
-                setState((prev) => ({ ...prev, producerList: payload.producerList ?? [] }));
-            }
-        });
-        socket.on('new-producer', () => {
-            socket.emit('get-producers', null, (resp) => {
-                if (resp?.producerList) {
-                    setState((prev) => ({ ...prev, producerList: resp.producerList ?? [] }));
+            socket.on('ice-servers', (servers) => {
+                iceServersRef.current = Array.isArray(servers) ? servers : [];
+            });
+            socket.on('room-updated', (payload) => {
+                if (payload?.producerList) {
+                    setState((prev) => ({ ...prev, producerList: payload.producerList ?? [] }));
                 }
             });
-        });
+            socket.on('new-producer', () => {
+                socket?.emit('get-producers', null, (resp) => {
+                    if (resp?.producerList) {
+                        setState((prev) => ({ ...prev, producerList: resp.producerList ?? [] }));
+                    }
+                });
+            });
+        })();
         return () => {
             clearTimeout(joinTimeout);
+            try {
+                socket?.removeAllListeners();
+                socket?.disconnect();
+            }
+            catch {
+                // ignore
+            }
             disconnect();
         };
     }, [roomId, displayName, disconnect]);

package/dist/services/livestream.service.d.ts

@@ -9,7 +9,18 @@ export type FetchStreamsResult = {
     streams: [];
     error: string;
 };
+export type MintViewerTokenResult = {
+    token: string;
+    error?: never;
+} | {
+    token?: never;
+    error: string;
+};
 export declare function fetchActiveStreams(): Promise<FetchStreamsResult>;
+export declare function mintViewerToken(params: {
+    roomId: string;
+    viewerId?: string | null;
+}): Promise<MintViewerTokenResult>;
 export declare function getSignalingUrl(): string;
 export declare function getSignalingWsUrl(): string;
 //# sourceMappingURL=livestream.service.d.ts.map

package/dist/services/livestream.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"livestream.service.d.ts","sourceRoot":"","sources":["../../src/services/livestream.service.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,MAAM,kBAAkB,GAC1B;IAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAC5C;IAAE,OAAO,EAAE,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CA6BtE;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAGD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C"}
+{"version":3,"file":"livestream.service.d.ts","sourceRoot":"","sources":["../../src/services/livestream.service.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,MAAM,kBAAkB,GAC1B;IAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAC5C;IAAE,OAAO,EAAE,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC,MAAM,MAAM,qBAAqB,GAC7B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAChC;IAAE,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAErC,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC,CA6BtE;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAyBjC;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAGD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C"}

package/dist/services/livestream.service.js

@@ -33,6 +33,39 @@ export async function fetchActiveStreams() {
         return { streams: [], error: message };
     }
 }
+export async function mintViewerToken(params) {
+    const base = getBaseUrl();
+    if (!base)
+        return { error: 'Livestream server not configured' };
+    const apiKey = getApiKey();
+    if (!apiKey)
+        return { error: 'Livestream API key not configured' };
+    if (!params.roomId)
+        return { error: 'roomId required' };
+    try {
+        const url = `${base.replace(/\/$/, '')}/api/viewer-token`;
+        const res = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'content-type': 'application/json',
+                'x-api-key': apiKey,
+            },
+            body: JSON.stringify({ roomId: params.roomId, viewerId: params.viewerId ?? null }),
+        });
+        if (!res.ok)
+            return { error: `HTTP ${res.status}` };
+        const data = (await res.json());
+        if (data?.error)
+            return { error: data.error };
+        if (!data?.token)
+            return { error: 'Missing token in response' };
+        return { token: data.token };
+    }
+    catch (e) {
+        const message = e instanceof Error ? e.message : 'Unknown error';
+        return { error: message };
+    }
+}
 export function getSignalingUrl() {
     return getUrlFromConfig();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasunk99-livestream-core",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Reusable livestream viewer/host module for React Native (Expo) — mediasoup + Socket.IO",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",