@pushler/vue 1.0.2 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +60 -8
- package/dist/pushler-vue.cjs.js +137 -19
- package/dist/pushler-vue.cjs.js.map +1 -1
- package/dist/pushler-vue.esm.js +137 -19
- package/dist/pushler-vue.esm.js.map +1 -1
- package/dist/pushler-vue.umd.js +137 -19
- package/dist/pushler-vue.umd.js.map +1 -1
- package/dist/pushler-vue.umd.min.js +2 -2
- package/dist/pushler-vue.umd.min.js.map +1 -1
- package/package.json +2 -2
- package/src/index.d.ts +15 -1
- package/src/index.js +1 -3
- package/src/plugin.js +0 -1
- package/src/usePushler.js +135 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushler-vue.umd.min.js","sources":["../src/usePushler.js","../src/plugin.js","../src/usePushlerChannel.js"],"sourcesContent":["import { ref, reactive, readonly, onUnmounted, watch, computed } from 'vue';\n\n/**\n * Состояния подключения\n */\nexport const ConnectionStates = {\n CONNECTING: 'connecting',\n CONNECTED: 'connected',\n DISCONNECTED: 'disconnected',\n RECONNECTING: 'reconnecting',\n FAILED: 'failed'\n};\n\n/**\n * Типы каналов\n */\nexport const ChannelTypes = {\n PUBLIC: 'public',\n PRIVATE: 'private',\n PRESENCE: 'presence'\n};\n\n/**\n * Vue composable для работы с Pushler WebSocket\n * \n * @param {Object} options - Опции подключения\n * @param {string} options.appKey - Ключ приложения\n * @param {string} options.wsUrl - URL WebSocket сервера\n * @param {string} options.authEndpoint - Эндпоинт авторизации для приватных каналов\n * @param {boolean} options.autoConnect - Автоматическое подключение (по умолчанию false)\n * @param {number} options.reconnectDelay - Задержка переподключения в мс (по умолчанию 1000)\n * @param {number} options.maxReconnectAttempts - Максимум попыток переподключения (по умолчанию 5)\n * @returns {Object} Реактивный объект с методами и состоянием\n */\nexport function usePushler(options = {}) {\n // Реактивное состояние\n const connectionState = ref(ConnectionStates.DISCONNECTED);\n const socketId = ref(null);\n const error = ref(null);\n const reconnectAttempts = ref(0);\n \n // Каналы\n const channels = reactive(new Map());\n const channelAliases = reactive(new Map());\n \n // Внутренние переменные\n let socket = null;\n let reconnectTimer = null;\n const eventListeners = new Map();\n \n // Конфигурация\n const config = {\n appKey: options.appKey || '',\n wsUrl: options.wsUrl || 'wss://ws.pushler.ru/app',\n authEndpoint: options.authEndpoint || '/pushler/auth',\n autoConnect: options.autoConnect || false,\n reconnectDelay: options.reconnectDelay || 1000,\n maxReconnectAttempts: options.maxReconnectAttempts || 5,\n };\n \n // Вычисляемые свойства\n const isConnected = computed(() => connectionState.value === ConnectionStates.CONNECTED);\n const isConnecting = computed(() => connectionState.value === ConnectionStates.CONNECTING);\n const isReconnecting = computed(() => connectionState.value === ConnectionStates.RECONNECTING);\n \n /**\n * Форматирование имени канала с префиксом appKey\n */\n function formatChannelName(channelName) {\n if (channelName.startsWith(config.appKey + ':')) {\n return channelName;\n }\n return `${config.appKey}:${channelName}`;\n }\n \n /**\n * Извлечение оригинального имени канала\n */\n function extractChannelName(fullChannelName) {\n const prefix = config.appKey + ':';\n if (fullChannelName.startsWith(prefix)) {\n return fullChannelName.substring(prefix.length);\n }\n return fullChannelName;\n }\n \n /**\n * Определение типа канала\n */\n function getChannelType(channelName) {\n const baseName = extractChannelName(channelName);\n if (baseName.startsWith('private-')) return ChannelTypes.PRIVATE;\n if (baseName.startsWith('presence-')) return ChannelTypes.PRESENCE;\n return ChannelTypes.PUBLIC;\n }\n \n /**\n * Подключение к WebSocket серверу\n */\n function connect(connectOptions = {}) {\n // Обновляем конфигурацию если переданы новые параметры\n if (connectOptions.appKey) config.appKey = connectOptions.appKey;\n if (connectOptions.wsUrl) config.wsUrl = connectOptions.wsUrl;\n if (connectOptions.authEndpoint) config.authEndpoint = connectOptions.authEndpoint;\n \n if (connectionState.value === ConnectionStates.CONNECTED ||\n connectionState.value === ConnectionStates.CONNECTING) {\n return;\n }\n \n connectionState.value = ConnectionStates.CONNECTING;\n error.value = null;\n \n try {\n // Формируем URL с ключом приложения\n const wsUrl = config.wsUrl.endsWith('/') \n ? `${config.wsUrl}${config.appKey}`\n : `${config.wsUrl}/${config.appKey}`;\n \n console.log('[Pushler Vue] Connecting to:', wsUrl);\n socket = new WebSocket(wsUrl);\n setupSocketHandlers();\n } catch (err) {\n console.error('[Pushler Vue] Connection error:', err);\n connectionState.value = ConnectionStates.FAILED;\n error.value = err.message;\n }\n }\n \n /**\n * Настройка обработчиков WebSocket\n */\n function setupSocketHandlers() {\n socket.onopen = () => {\n console.log('[Pushler Vue] WebSocket opened, waiting for connection_established...');\n };\n \n socket.onmessage = (event) => {\n handleMessage(event);\n };\n \n socket.onclose = (event) => {\n console.log('[Pushler Vue] WebSocket closed:', event.code, event.reason);\n connectionState.value = ConnectionStates.DISCONNECTED;\n socketId.value = null;\n \n // Автопереподключение\n if (event.code !== 1000 && reconnectAttempts.value < config.maxReconnectAttempts) {\n scheduleReconnect();\n }\n };\n \n socket.onerror = (err) => {\n console.error('[Pushler Vue] WebSocket error:', err);\n connectionState.value = ConnectionStates.FAILED;\n error.value = 'Connection failed';\n };\n }\n \n /**\n * Обработка входящих сообщений\n */\n function handleMessage(event) {\n try {\n // Поддержка нескольких сообщений в одном event\n const messages = event.data.trim().split('\\n').filter(line => line.trim());\n \n for (const msgData of messages) {\n processMessage(JSON.parse(msgData));\n }\n } catch (err) {\n console.error('[Pushler Vue] Error parsing message:', err);\n }\n }\n \n /**\n * Обработка отдельного сообщения\n */\n function processMessage(message) {\n switch (message.event) {\n case 'pushler:connection_established':\n handleConnectionEstablished(message.data);\n break;\n case 'pushler:subscription_succeeded':\n handleSubscriptionSucceeded(message);\n break;\n case 'pushler:auth_success':\n handleAuthSuccess(message);\n break;\n case 'pushler:auth_error':\n handleAuthError(message);\n break;\n default:\n handleChannelMessage(message);\n }\n }\n \n /**\n * Обработка установления соединения\n */\n function handleConnectionEstablished(data) {\n socketId.value = data.socket_id;\n connectionState.value = ConnectionStates.CONNECTED;\n reconnectAttempts.value = 0;\n \n console.log('[Pushler Vue] Connected with socket ID:', socketId.value);\n \n // Переподписка на все каналы\n resubscribeAllChannels();\n \n emit('connected', { socketId: socketId.value });\n }\n \n /**\n * Переподписка на все каналы\n */\n function resubscribeAllChannels() {\n for (const [name, channel] of channels.entries()) {\n channel.subscribed = false;\n performChannelSubscription(channel);\n }\n }\n \n /**\n * Обработка успешной подписки\n */\n function handleSubscriptionSucceeded(message) {\n const channel = channels.get(message.channel);\n if (channel) {\n channel.subscribed = true;\n channel.emit('subscribed', message.data || {});\n }\n }\n \n /**\n * Обработка успешной авторизации\n */\n function handleAuthSuccess(message) {\n const channel = channels.get(message.data.channel);\n if (channel) {\n channel.subscribed = true;\n channel.emit('subscribed', message.data);\n }\n emit('auth_success', message.data);\n }\n \n /**\n * Обработка ошибки авторизации\n */\n function handleAuthError(message) {\n error.value = message.data.error;\n emit('auth_error', message.data);\n }\n \n /**\n * Обработка сообщения канала\n */\n function handleChannelMessage(message) {\n const { channel: channelName, event, data } = message;\n const channel = channels.get(channelName);\n \n if (channel) {\n channel.emit(event, data);\n }\n \n emit('message', { \n channel: extractChannelName(channelName), \n event, \n data \n });\n }\n \n /**\n * Планирование переподключения\n */\n function scheduleReconnect() {\n if (reconnectTimer) {\n clearTimeout(reconnectTimer);\n }\n \n reconnectAttempts.value++;\n connectionState.value = ConnectionStates.RECONNECTING;\n \n const delay = config.reconnectDelay * reconnectAttempts.value;\n console.log(`[Pushler Vue] Reconnecting in ${delay}ms (attempt ${reconnectAttempts.value}/${config.maxReconnectAttempts})`);\n \n reconnectTimer = setTimeout(() => {\n connect();\n }, delay);\n }\n \n /**\n * Отключение от сервера\n */\n function disconnect() {\n if (reconnectTimer) {\n clearTimeout(reconnectTimer);\n reconnectTimer = null;\n }\n \n if (socket) {\n socket.close(1000, 'User disconnect');\n socket = null;\n }\n \n connectionState.value = ConnectionStates.DISCONNECTED;\n socketId.value = null;\n channels.clear();\n channelAliases.clear();\n reconnectAttempts.value = 0;\n \n emit('disconnected');\n }\n \n /**\n * Отправка сообщения через WebSocket\n */\n function sendMessage(message) {\n if (socket && socket.readyState === WebSocket.OPEN) {\n socket.send(JSON.stringify(message));\n }\n }\n \n /**\n * Подписка на канал\n * @param {string} channelName - Имя канала\n * @param {Object} options - Опции (signature для приватных, user для presence)\n * @returns {Object} Реактивный объект канала\n */\n function subscribe(channelName, subscribeOptions = {}) {\n const fullChannelName = formatChannelName(channelName);\n \n if (channels.has(fullChannelName)) {\n return channels.get(fullChannelName);\n }\n \n // Создаем реактивный канал\n const channel = reactive({\n name: fullChannelName,\n originalName: channelName,\n type: getChannelType(channelName),\n subscribed: false,\n options: subscribeOptions,\n listeners: new Map(),\n \n // Методы канала\n on(event, callback) {\n if (!this.listeners.has(event)) {\n this.listeners.set(event, []);\n }\n this.listeners.get(event).push(callback);\n return this;\n },\n \n off(event, callback) {\n if (this.listeners.has(event)) {\n const list = this.listeners.get(event);\n const idx = list.indexOf(callback);\n if (idx > -1) list.splice(idx, 1);\n }\n return this;\n },\n \n emit(event, data) {\n if (this.listeners.has(event)) {\n this.listeners.get(event).forEach(cb => {\n try {\n cb(data);\n } catch (err) {\n console.error('[Pushler Vue] Channel event error:', err);\n }\n });\n }\n },\n \n unsubscribe() {\n unsubscribe(channelName);\n }\n });\n \n channels.set(fullChannelName, channel);\n channelAliases.set(channelName, fullChannelName);\n \n // Подписываемся если уже подключены\n if (connectionState.value === ConnectionStates.CONNECTED) {\n performChannelSubscription(channel);\n }\n \n return channel;\n }\n \n /**\n * Выполнение подписки на канал\n */\n async function performChannelSubscription(channel) {\n if (connectionState.value !== ConnectionStates.CONNECTED) {\n return;\n }\n \n const channelType = channel.type;\n \n // Публичные каналы\n if (channelType === ChannelTypes.PUBLIC) {\n sendMessage({\n event: 'pushler:subscribe',\n data: {\n channel: channel.name,\n app_key: config.appKey\n }\n });\n return;\n }\n \n // Приватные и presence каналы требуют авторизации\n try {\n const authData = await getAuthData(channel);\n sendMessage({\n event: 'pushler:auth',\n data: authData\n });\n } catch (err) {\n console.error('[Pushler Vue] Auth error:', err);\n error.value = err.message;\n }\n }\n \n /**\n * Получение данных авторизации для приватных/presence каналов\n * \n * Для приватных каналов подпись ДОЛЖНА быть получена с вашего бэкенда,\n * либо передана в options.signature при подписке.\n * \n * НИКОГДА не храните секретный ключ в клиентском коде!\n */\n async function getAuthData(channel) {\n if (!socketId.value) {\n throw new Error('Socket ID not available');\n }\n \n const authData = {\n app_key: config.appKey,\n channel: channel.name,\n socket_id: socketId.value\n };\n \n // Если подпись уже предоставлена в options\n if (channel.options.signature) {\n authData.signature = channel.options.signature;\n } else {\n // Запрашиваем подпись с бэкенда\n authData.signature = await fetchSignature(channel);\n }\n \n // Данные пользователя для presence каналов\n if (channel.type === ChannelTypes.PRESENCE && channel.options.user) {\n authData.user = channel.options.user;\n }\n \n return authData;\n }\n \n /**\n * Запрос подписи с бэкенда\n * \n * Ваш бэкенд должен:\n * 1. Проверить авторизацию пользователя\n * 2. Сгенерировать HMAC-SHA256 подпись с секретным ключом\n * 3. Вернуть подпись клиенту\n */\n async function fetchSignature(channel) {\n const response = await fetch(config.authEndpoint, {\n method: 'POST',\n headers: { 'Content-Type': 'application/json' },\n credentials: 'include', // Включаем куки для авторизации\n body: JSON.stringify({\n channel_name: channel.name,\n socket_id: socketId.value,\n app_key: config.appKey,\n user_data: channel.options.user\n })\n });\n \n if (!response.ok) {\n const err = await response.json().catch(() => ({ error: 'Auth request failed' }));\n throw new Error(err.error || 'Failed to get signature');\n }\n \n const data = await response.json();\n return data.signature;\n }\n \n /**\n * Отписка от канала\n */\n function unsubscribe(channelName) {\n const fullChannelName = channelAliases.get(channelName) || formatChannelName(channelName);\n const channel = channels.get(fullChannelName);\n \n if (channel) {\n if (channel.subscribed && connectionState.value === ConnectionStates.CONNECTED) {\n sendMessage({\n event: 'pushler:unsubscribe',\n data: { channel: fullChannelName }\n });\n }\n \n channels.delete(fullChannelName);\n channelAliases.delete(channelName);\n }\n }\n \n /**\n * Получение канала по имени\n */\n function channel(channelName) {\n const fullChannelName = channelAliases.get(channelName) || formatChannelName(channelName);\n return channels.get(fullChannelName);\n }\n \n /**\n * Получение списка каналов\n */\n function getChannels() {\n return Array.from(channels.values()).map(ch => ({\n name: ch.originalName,\n fullName: ch.name,\n type: ch.type,\n subscribed: ch.subscribed\n }));\n }\n \n /**\n * Подписка на глобальное событие\n */\n function on(event, callback) {\n if (!eventListeners.has(event)) {\n eventListeners.set(event, []);\n }\n eventListeners.get(event).push(callback);\n }\n \n /**\n * Отписка от глобального события\n */\n function off(event, callback) {\n if (eventListeners.has(event)) {\n const list = eventListeners.get(event);\n const idx = list.indexOf(callback);\n if (idx > -1) list.splice(idx, 1);\n }\n }\n \n /**\n * Вызов глобального события\n */\n function emit(event, data) {\n if (eventListeners.has(event)) {\n eventListeners.get(event).forEach(cb => {\n try {\n cb(data);\n } catch (err) {\n console.error('[Pushler Vue] Event error:', err);\n }\n });\n }\n }\n \n // Автоматическое отключение при размонтировании компонента\n onUnmounted(() => {\n disconnect();\n });\n \n // Автоподключение если указано\n if (config.autoConnect && config.appKey) {\n connect();\n }\n \n return {\n // Состояние (readonly для защиты от внешних изменений)\n connectionState: readonly(connectionState),\n socketId: readonly(socketId),\n error: readonly(error),\n reconnectAttempts: readonly(reconnectAttempts),\n \n // Вычисляемые свойства\n isConnected,\n isConnecting,\n isReconnecting,\n \n // Методы\n connect,\n disconnect,\n subscribe,\n unsubscribe,\n channel,\n getChannels,\n on,\n off,\n \n // Утилиты\n formatChannelName,\n extractChannelName,\n getChannelType,\n \n // Константы\n ConnectionStates,\n ChannelTypes,\n };\n}\n\nexport default usePushler;\n","import { usePushler, ConnectionStates, ChannelTypes } from './usePushler';\n\n/**\n * Символ для инъекции Pushler\n */\nexport const PushlerKey = Symbol('pushler');\n\n/**\n * Vue Plugin для глобальной инициализации Pushler\n * \n * Использование:\n * \n * ```js\n * import { createApp } from 'vue';\n * import { PushlerPlugin } from '@pushler/vue';\n * \n * const app = createApp(App);\n * app.use(PushlerPlugin, {\n * appKey: 'your-app-key',\n * wsUrl: 'wss://ws.pushler.ru/app',\n * autoConnect: true\n * });\n * ```\n * \n * Затем в компонентах:\n * \n * ```js\n * import { inject } from 'vue';\n * import { PushlerKey } from '@pushler/vue';\n * \n * const pushler = inject(PushlerKey);\n * ```\n */\nexport const PushlerPlugin = {\n install(app, options = {}) {\n // Создаем глобальный инстанс Pushler\n const pushler = usePushler(options);\n \n // Предоставляем через provide/inject\n app.provide(PushlerKey, pushler);\n \n // Также добавляем как глобальное свойство (для Options API)\n app.config.globalProperties.$pushler = pushler;\n \n // Экспортируем константы\n app.config.globalProperties.$PushlerConnectionStates = ConnectionStates;\n app.config.globalProperties.$PushlerChannelTypes = ChannelTypes;\n }\n};\n\n/**\n * Хелпер для получения инстанса Pushler в setup()\n */\nexport function usePushlerInstance() {\n const pushler = inject(PushlerKey);\n if (!pushler) {\n throw new Error(\n '[Pushler Vue] No Pushler instance found. ' +\n 'Make sure to install PushlerPlugin or provide a Pushler instance.'\n );\n }\n return pushler;\n}\n\nexport default PushlerPlugin;\n","import { ref, reactive, onUnmounted, watch } from 'vue';\n\n/**\n * Vue composable для работы с отдельным каналом Pushler\n * \n * Можно использовать автономно или совместно с usePushler\n * \n * @param {Object} pushler - Инстанс usePushler\n * @param {string} channelName - Имя канала\n * @param {Object} options - Опции канала\n * @returns {Object} Реактивный объект канала с событиями\n */\nexport function usePushlerChannel(pushler, channelName, options = {}) {\n const channel = ref(null);\n const isSubscribed = ref(false);\n const lastEvent = ref(null);\n const events = reactive([]);\n const eventHandlers = new Map();\n \n /**\n * Максимальное количество событий в буфере\n */\n const maxEvents = options.maxEvents || 100;\n \n /**\n * Подписка на канал\n */\n function subscribe() {\n if (!pushler || !channelName) return;\n \n channel.value = pushler.subscribe(channelName, options);\n \n // Отслеживаем статус подписки\n channel.value.on('subscribed', () => {\n isSubscribed.value = true;\n });\n \n return channel.value;\n }\n \n /**\n * Отписка от канала\n */\n function unsubscribe() {\n if (pushler && channelName) {\n pushler.unsubscribe(channelName);\n channel.value = null;\n isSubscribed.value = false;\n }\n }\n \n /**\n * Подписка на событие канала\n * @param {string} eventName - Имя события\n * @param {Function} callback - Обработчик\n */\n function on(eventName, callback) {\n if (!channel.value) {\n subscribe();\n }\n \n const handler = (data) => {\n // Сохраняем последнее событие\n lastEvent.value = {\n event: eventName,\n data,\n timestamp: new Date()\n };\n \n // Добавляем в буфер событий\n events.unshift(lastEvent.value);\n if (events.length > maxEvents) {\n events.pop();\n }\n \n // Вызываем пользовательский обработчик\n callback(data);\n };\n \n eventHandlers.set(eventName, handler);\n channel.value.on(eventName, handler);\n \n return () => off(eventName);\n }\n \n /**\n * Отписка от события канала\n */\n function off(eventName) {\n if (channel.value && eventHandlers.has(eventName)) {\n channel.value.off(eventName, eventHandlers.get(eventName));\n eventHandlers.delete(eventName);\n }\n }\n \n /**\n * Очистка буфера событий\n */\n function clearEvents() {\n events.length = 0;\n lastEvent.value = null;\n }\n \n // Автоматическая подписка если указано\n if (options.autoSubscribe !== false && pushler?.isConnected?.value) {\n subscribe();\n }\n \n // Подписываемся при подключении\n if (pushler) {\n watch(() => pushler.isConnected.value, (connected) => {\n if (connected && options.autoSubscribe !== false && !channel.value) {\n subscribe();\n }\n });\n }\n \n // Автоматическая отписка при размонтировании\n onUnmounted(() => {\n unsubscribe();\n });\n \n return {\n channel,\n isSubscribed,\n lastEvent,\n events,\n \n subscribe,\n unsubscribe,\n on,\n off,\n clearEvents,\n };\n}\n\nexport default usePushlerChannel;\n"],"names":["ConnectionStates","CONNECTING","CONNECTED","DISCONNECTED","RECONNECTING","FAILED","ChannelTypes","PUBLIC","PRIVATE","PRESENCE","usePushler","options","connectionState","ref","socketId","error","reconnectAttempts","channels","reactive","Map","channelAliases","socket","reconnectTimer","eventListeners","config","appKey","wsUrl","authEndpoint","autoConnect","reconnectDelay","maxReconnectAttempts","isConnected","computed","value","isConnecting","isReconnecting","formatChannelName","channelName","startsWith","extractChannelName","fullChannelName","prefix","substring","length","getChannelType","baseName","connect","connectOptions","endsWith","console","log","WebSocket","onopen","onmessage","event","messages","data","trim","split","filter","line","msgData","processMessage","JSON","parse","err","handleMessage","onclose","code","reason","clearTimeout","delay","setTimeout","scheduleReconnect","onerror","message","socket_id","name","channel","entries","subscribed","performChannelSubscription","resubscribeAllChannels","emit","get","handleSubscriptionSucceeded","handleAuthSuccess","handleAuthError","handleChannelMessage","disconnect","close","clear","sendMessage","readyState","OPEN","send","stringify","async","type","authData","Error","app_key","signature","response","fetch","method","headers","credentials","body","channel_name","user_data","user","ok","json","catch","fetchSignature","getAuthData","unsubscribe","delete","has","forEach","cb","onUnmounted","readonly","subscribe","subscribeOptions","originalName","listeners","on","callback","this","set","push","off","list","idx","indexOf","splice","getChannels","Array","from","values","map","ch","fullName","PushlerKey","Symbol","PushlerPlugin","install","app","pushler","provide","globalProperties","$pushler","$PushlerConnectionStates","$PushlerChannelTypes","isSubscribed","lastEvent","events","eventHandlers","maxEvents","eventName","autoSubscribe","watch","connected","handler","timestamp","Date","unshift","pop","clearEvents","inject"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pushler-vue.umd.min.js","sources":["../src/usePushler.js","../src/plugin.js","../src/usePushlerChannel.js"],"sourcesContent":["import { ref, reactive, readonly, onUnmounted, watch, computed } from 'vue';\n\n/**\n * Состояния подключения\n */\nexport const ConnectionStates = {\n CONNECTING: 'connecting',\n CONNECTED: 'connected',\n DISCONNECTED: 'disconnected',\n RECONNECTING: 'reconnecting',\n FAILED: 'failed'\n};\n\n/**\n * Типы каналов\n */\nexport const ChannelTypes = {\n PUBLIC: 'public',\n PRIVATE: 'private',\n PRESENCE: 'presence'\n};\n\n/**\n * Vue composable для работы с Pushler WebSocket\n * \n * @param {Object} options - Опции подключения\n * @param {string} options.appKey - Ключ приложения\n * @param {string} options.wsUrl - URL WebSocket сервера\n * @param {string} options.authEndpoint - Эндпоинт авторизации для приватных каналов\n * @param {Object} options.authHeaders - Статические заголовки для авторизации (например, { Authorization: 'Bearer token' })\n * @param {Function} options.getAuthHeaders - Функция для динамического получения заголовков авторизации\n * @param {boolean} options.autoConnect - Автоматическое подключение (по умолчанию false)\n * @param {number} options.reconnectDelay - Задержка переподключения в мс (по умолчанию 1000)\n * @param {number} options.maxReconnectAttempts - Максимум попыток переподключения (по умолчанию 5)\n * @returns {Object} Реактивный объект с методами и состоянием\n */\nexport function usePushler(options = {}) {\n // Реактивное состояние\n const connectionState = ref(ConnectionStates.DISCONNECTED);\n const socketId = ref(null);\n const error = ref(null);\n const reconnectAttempts = ref(0);\n \n // Каналы\n const channels = reactive(new Map());\n const channelAliases = reactive(new Map());\n \n // Внутренние переменные\n let socket = null;\n let reconnectTimer = null;\n const eventListeners = new Map();\n \n // Promise для ожидания подключения\n let connectionPromise = null;\n let connectionResolve = null;\n let connectionReject = null;\n \n // Конфигурация\n const appKey = options.appKey || '';\n const config = {\n appKey: appKey,\n // wsUrl формируется автоматически из appKey, но можно переопределить\n wsUrl: options.wsUrl || `wss://ws.pushler.ru/app/${appKey}`,\n authEndpoint: options.authEndpoint || '/pushler/auth',\n authHeaders: options.authHeaders || null,\n getAuthHeaders: options.getAuthHeaders || null,\n autoConnect: options.autoConnect || false,\n reconnectDelay: options.reconnectDelay || 1000,\n maxReconnectAttempts: options.maxReconnectAttempts || 5,\n };\n \n // Вычисляемые свойства\n const isConnected = computed(() => connectionState.value === ConnectionStates.CONNECTED);\n const isConnecting = computed(() => connectionState.value === ConnectionStates.CONNECTING);\n const isReconnecting = computed(() => connectionState.value === ConnectionStates.RECONNECTING);\n \n /**\n * Форматирование имени канала с префиксом appKey\n */\n function formatChannelName(channelName) {\n if (channelName.startsWith(config.appKey + ':')) {\n return channelName;\n }\n return `${config.appKey}:${channelName}`;\n }\n \n /**\n * Извлечение оригинального имени канала\n */\n function extractChannelName(fullChannelName) {\n const prefix = config.appKey + ':';\n if (fullChannelName.startsWith(prefix)) {\n return fullChannelName.substring(prefix.length);\n }\n return fullChannelName;\n }\n \n /**\n * Определение типа канала\n */\n function getChannelType(channelName) {\n const baseName = extractChannelName(channelName);\n if (baseName.startsWith('private-')) return ChannelTypes.PRIVATE;\n if (baseName.startsWith('presence-')) return ChannelTypes.PRESENCE;\n return ChannelTypes.PUBLIC;\n }\n \n /**\n * Подключение к WebSocket серверу\n * @param {Object} connectOptions - Опции подключения\n * @returns {Promise} Promise, который резолвится при успешном подключении\n */\n function connect(connectOptions = {}) {\n // Обновляем конфигурацию если переданы новые параметры\n if (connectOptions.appKey) config.appKey = connectOptions.appKey;\n if (connectOptions.wsUrl) config.wsUrl = connectOptions.wsUrl;\n if (connectOptions.authEndpoint) config.authEndpoint = connectOptions.authEndpoint;\n if (connectOptions.authHeaders) config.authHeaders = connectOptions.authHeaders;\n if (connectOptions.getAuthHeaders) config.getAuthHeaders = connectOptions.getAuthHeaders;\n \n // Если уже подключены - возвращаем резолвленный Promise\n if (connectionState.value === ConnectionStates.CONNECTED) {\n return Promise.resolve({ socketId: socketId.value });\n }\n \n // Если уже идёт подключение - возвращаем существующий Promise\n if (connectionState.value === ConnectionStates.CONNECTING && connectionPromise) {\n return connectionPromise;\n }\n \n // Создаём новый Promise для ожидания подключения\n connectionPromise = new Promise((resolve, reject) => {\n connectionResolve = resolve;\n connectionReject = reject;\n });\n \n connectionState.value = ConnectionStates.CONNECTING;\n error.value = null;\n \n try {\n // wsUrl уже содержит appKey из конфигурации\n console.log('[Pushler Vue] Connecting to:', config.wsUrl);\n socket = new WebSocket(config.wsUrl);\n setupSocketHandlers();\n } catch (err) {\n console.error('[Pushler Vue] Connection error:', err);\n connectionState.value = ConnectionStates.FAILED;\n error.value = err.message;\n if (connectionReject) {\n connectionReject(err);\n connectionPromise = null;\n connectionResolve = null;\n connectionReject = null;\n }\n }\n \n return connectionPromise;\n }\n \n /**\n * Ожидание установления соединения\n * @param {number} timeout - Таймаут в мс (по умолчанию 10000)\n * @returns {Promise} Promise с socketId\n */\n function waitForConnection(timeout = 10000) {\n // Если уже подключены\n if (connectionState.value === ConnectionStates.CONNECTED && socketId.value) {\n return Promise.resolve({ socketId: socketId.value });\n }\n \n // Если есть активный Promise подключения\n if (connectionPromise) {\n return Promise.race([\n connectionPromise,\n new Promise((_, reject) => \n setTimeout(() => reject(new Error('Connection timeout')), timeout)\n )\n ]);\n }\n \n // Если не подключаемся - начинаем подключение\n if (connectionState.value === ConnectionStates.DISCONNECTED) {\n return connect();\n }\n \n // Для других состояний создаём Promise, который ждёт connected события\n return new Promise((resolve, reject) => {\n const timeoutId = setTimeout(() => {\n off('connected', onConnected);\n off('error', onError);\n reject(new Error('Connection timeout'));\n }, timeout);\n \n const onConnected = (data) => {\n clearTimeout(timeoutId);\n off('error', onError);\n resolve(data);\n };\n \n const onError = (err) => {\n clearTimeout(timeoutId);\n off('connected', onConnected);\n reject(err);\n };\n \n on('connected', onConnected);\n on('error', onError);\n });\n }\n \n /**\n * Настройка обработчиков WebSocket\n */\n function setupSocketHandlers() {\n socket.onopen = () => {\n console.log('[Pushler Vue] WebSocket opened, waiting for connection_established...');\n };\n \n socket.onmessage = (event) => {\n handleMessage(event);\n };\n \n socket.onclose = (event) => {\n console.log('[Pushler Vue] WebSocket closed:', event.code, event.reason);\n connectionState.value = ConnectionStates.DISCONNECTED;\n socketId.value = null;\n \n // Автопереподключение\n if (event.code !== 1000 && reconnectAttempts.value < config.maxReconnectAttempts) {\n scheduleReconnect();\n }\n };\n \n socket.onerror = (err) => {\n console.error('[Pushler Vue] WebSocket error:', err);\n connectionState.value = ConnectionStates.FAILED;\n error.value = 'Connection failed';\n \n // Реджектим Promise подключения\n if (connectionReject) {\n connectionReject(new Error('Connection failed'));\n connectionPromise = null;\n connectionResolve = null;\n connectionReject = null;\n }\n };\n }\n \n /**\n * Обработка входящих сообщений\n */\n function handleMessage(event) {\n try {\n // Поддержка нескольких сообщений в одном event\n const messages = event.data.trim().split('\\n').filter(line => line.trim());\n \n for (const msgData of messages) {\n processMessage(JSON.parse(msgData));\n }\n } catch (err) {\n console.error('[Pushler Vue] Error parsing message:', err);\n }\n }\n \n /**\n * Обработка отдельного сообщения\n */\n function processMessage(message) {\n switch (message.event) {\n case 'pushler:connection_established':\n handleConnectionEstablished(message.data);\n break;\n case 'pushler:subscription_succeeded':\n handleSubscriptionSucceeded(message);\n break;\n case 'pushler:auth_success':\n handleAuthSuccess(message);\n break;\n case 'pushler:auth_error':\n handleAuthError(message);\n break;\n default:\n handleChannelMessage(message);\n }\n }\n \n /**\n * Обработка установления соединения\n */\n function handleConnectionEstablished(data) {\n socketId.value = data.socket_id;\n connectionState.value = ConnectionStates.CONNECTED;\n reconnectAttempts.value = 0;\n \n console.log('[Pushler Vue] Connected with socket ID:', socketId.value);\n \n // Резолвим Promise подключения\n if (connectionResolve) {\n connectionResolve({ socketId: socketId.value });\n connectionPromise = null;\n connectionResolve = null;\n connectionReject = null;\n }\n \n // Переподписка на все каналы\n resubscribeAllChannels();\n \n emit('connected', { socketId: socketId.value });\n }\n \n /**\n * Переподписка на все каналы\n */\n function resubscribeAllChannels() {\n for (const [name, channel] of channels.entries()) {\n channel.subscribed = false;\n performChannelSubscription(channel);\n }\n }\n \n /**\n * Обработка успешной подписки\n */\n function handleSubscriptionSucceeded(message) {\n const channel = channels.get(message.channel);\n if (channel) {\n channel.subscribed = true;\n channel.emit('subscribed', message.data || {});\n }\n }\n \n /**\n * Обработка успешной авторизации\n */\n function handleAuthSuccess(message) {\n const channel = channels.get(message.data.channel);\n if (channel) {\n channel.subscribed = true;\n channel.emit('subscribed', message.data);\n }\n emit('auth_success', message.data);\n }\n \n /**\n * Обработка ошибки авторизации\n */\n function handleAuthError(message) {\n error.value = message.data.error;\n emit('auth_error', message.data);\n }\n \n /**\n * Обработка сообщения канала\n */\n function handleChannelMessage(message) {\n const { channel: channelName, event, data } = message;\n const channel = channels.get(channelName);\n \n if (channel) {\n channel.emit(event, data);\n }\n \n emit('message', { \n channel: extractChannelName(channelName), \n event, \n data \n });\n }\n \n /**\n * Планирование переподключения\n */\n function scheduleReconnect() {\n if (reconnectTimer) {\n clearTimeout(reconnectTimer);\n }\n \n reconnectAttempts.value++;\n connectionState.value = ConnectionStates.RECONNECTING;\n \n const delay = config.reconnectDelay * reconnectAttempts.value;\n console.log(`[Pushler Vue] Reconnecting in ${delay}ms (attempt ${reconnectAttempts.value}/${config.maxReconnectAttempts})`);\n \n reconnectTimer = setTimeout(() => {\n connect();\n }, delay);\n }\n \n /**\n * Отключение от сервера\n */\n function disconnect() {\n if (reconnectTimer) {\n clearTimeout(reconnectTimer);\n reconnectTimer = null;\n }\n \n if (socket) {\n socket.close(1000, 'User disconnect');\n socket = null;\n }\n \n connectionState.value = ConnectionStates.DISCONNECTED;\n socketId.value = null;\n channels.clear();\n channelAliases.clear();\n reconnectAttempts.value = 0;\n \n emit('disconnected');\n }\n \n /**\n * Отправка сообщения через WebSocket\n */\n function sendMessage(message) {\n if (socket && socket.readyState === WebSocket.OPEN) {\n socket.send(JSON.stringify(message));\n }\n }\n \n /**\n * Подписка на канал\n * @param {string} channelName - Имя канала\n * @param {Object} options - Опции (signature для приватных, user для presence)\n * @returns {Object} Реактивный объект канала\n */\n function subscribe(channelName, subscribeOptions = {}) {\n const fullChannelName = formatChannelName(channelName);\n \n if (channels.has(fullChannelName)) {\n return channels.get(fullChannelName);\n }\n \n // Создаем реактивный канал\n const channel = reactive({\n name: fullChannelName,\n originalName: channelName,\n type: getChannelType(channelName),\n subscribed: false,\n options: subscribeOptions,\n listeners: new Map(),\n \n // Методы канала\n on(event, callback) {\n if (!this.listeners.has(event)) {\n this.listeners.set(event, []);\n }\n this.listeners.get(event).push(callback);\n return this;\n },\n \n off(event, callback) {\n if (this.listeners.has(event)) {\n const list = this.listeners.get(event);\n const idx = list.indexOf(callback);\n if (idx > -1) list.splice(idx, 1);\n }\n return this;\n },\n \n emit(event, data) {\n if (this.listeners.has(event)) {\n this.listeners.get(event).forEach(cb => {\n try {\n cb(data);\n } catch (err) {\n console.error('[Pushler Vue] Channel event error:', err);\n }\n });\n }\n },\n \n unsubscribe() {\n unsubscribe(channelName);\n }\n });\n \n channels.set(fullChannelName, channel);\n channelAliases.set(channelName, fullChannelName);\n \n // Подписываемся если уже подключены\n if (connectionState.value === ConnectionStates.CONNECTED) {\n performChannelSubscription(channel);\n }\n \n return channel;\n }\n \n /**\n * Выполнение подписки на канал\n */\n async function performChannelSubscription(channel) {\n if (connectionState.value !== ConnectionStates.CONNECTED) {\n return;\n }\n \n const channelType = channel.type;\n \n // Публичные каналы\n if (channelType === ChannelTypes.PUBLIC) {\n sendMessage({\n event: 'pushler:subscribe',\n data: {\n channel: channel.name,\n app_key: config.appKey\n }\n });\n return;\n }\n \n // Приватные и presence каналы требуют авторизации\n try {\n const authData = await getAuthData(channel);\n sendMessage({\n event: 'pushler:auth',\n data: authData\n });\n } catch (err) {\n console.error('[Pushler Vue] Auth error:', err);\n error.value = err.message;\n }\n }\n \n /**\n * Получение данных авторизации для приватных/presence каналов\n * \n * Для приватных каналов подпись ДОЛЖНА быть получена с вашего бэкенда,\n * либо передана в options.signature при подписке.\n * \n * НИКОГДА не храните секретный ключ в клиентском коде!\n */\n async function getAuthData(channel) {\n if (!socketId.value) {\n throw new Error('Socket ID not available');\n }\n \n const authData = {\n app_key: config.appKey,\n channel: channel.name,\n socket_id: socketId.value\n };\n \n // Если подпись уже предоставлена в options\n if (channel.options.signature) {\n authData.signature = channel.options.signature;\n } else {\n // Запрашиваем подпись с бэкенда\n authData.signature = await fetchSignature(channel);\n }\n \n // Данные пользователя для presence каналов\n if (channel.type === ChannelTypes.PRESENCE && channel.options.user) {\n authData.user = channel.options.user;\n }\n \n return authData;\n }\n \n /**\n * Получение заголовков для авторизации\n */\n function getAuthRequestHeaders() {\n const headers = { 'Content-Type': 'application/json' };\n \n // Динамические заголовки имеют приоритет\n if (typeof config.getAuthHeaders === 'function') {\n const dynamicHeaders = config.getAuthHeaders();\n Object.assign(headers, dynamicHeaders);\n } else if (config.authHeaders) {\n // Статические заголовки\n Object.assign(headers, config.authHeaders);\n }\n \n return headers;\n }\n \n /**\n * Запрос подписи с бэкенда\n * \n * Ваш бэкенд должен:\n * 1. Проверить авторизацию пользователя\n * 2. Сгенерировать HMAC-SHA256 подпись с секретным ключом\n * 3. Вернуть подпись клиенту\n */\n async function fetchSignature(channel) {\n const headers = getAuthRequestHeaders();\n const hasAuthHeaders = config.authHeaders || config.getAuthHeaders;\n \n const response = await fetch(config.authEndpoint, {\n method: 'POST',\n headers,\n // Если есть authHeaders, не используем credentials (JWT режим)\n // Если нет — используем cookies для обратной совместимости\n ...(hasAuthHeaders ? {} : { credentials: 'include' }),\n body: JSON.stringify({\n channel_name: channel.name,\n socket_id: socketId.value,\n app_key: config.appKey,\n user_data: channel.options.user\n })\n });\n \n if (!response.ok) {\n const err = await response.json().catch(() => ({ error: 'Auth request failed' }));\n throw new Error(err.error || 'Failed to get signature');\n }\n \n const data = await response.json();\n return data.signature;\n }\n \n /**\n * Отписка от канала\n */\n function unsubscribe(channelName) {\n const fullChannelName = channelAliases.get(channelName) || formatChannelName(channelName);\n const channel = channels.get(fullChannelName);\n \n if (channel) {\n if (channel.subscribed && connectionState.value === ConnectionStates.CONNECTED) {\n sendMessage({\n event: 'pushler:unsubscribe',\n data: { channel: fullChannelName }\n });\n }\n \n channels.delete(fullChannelName);\n channelAliases.delete(channelName);\n }\n }\n \n /**\n * Получение канала по имени\n */\n function channel(channelName) {\n const fullChannelName = channelAliases.get(channelName) || formatChannelName(channelName);\n return channels.get(fullChannelName);\n }\n \n /**\n * Получение списка каналов\n */\n function getChannels() {\n return Array.from(channels.values()).map(ch => ({\n name: ch.originalName,\n fullName: ch.name,\n type: ch.type,\n subscribed: ch.subscribed\n }));\n }\n \n /**\n * Подписка на глобальное событие\n */\n function on(event, callback) {\n if (!eventListeners.has(event)) {\n eventListeners.set(event, []);\n }\n eventListeners.get(event).push(callback);\n }\n \n /**\n * Отписка от глобального события\n */\n function off(event, callback) {\n if (eventListeners.has(event)) {\n const list = eventListeners.get(event);\n const idx = list.indexOf(callback);\n if (idx > -1) list.splice(idx, 1);\n }\n }\n \n /**\n * Вызов глобального события\n */\n function emit(event, data) {\n if (eventListeners.has(event)) {\n eventListeners.get(event).forEach(cb => {\n try {\n cb(data);\n } catch (err) {\n console.error('[Pushler Vue] Event error:', err);\n }\n });\n }\n }\n \n // Автоматическое отключение при размонтировании компонента\n onUnmounted(() => {\n disconnect();\n });\n \n // Автоподключение если указано\n if (config.autoConnect && config.appKey) {\n connect();\n }\n \n return {\n // Состояние (readonly для защиты от внешних изменений)\n connectionState: readonly(connectionState),\n socketId: readonly(socketId),\n error: readonly(error),\n reconnectAttempts: readonly(reconnectAttempts),\n \n // Вычисляемые свойства\n isConnected,\n isConnecting,\n isReconnecting,\n \n // Методы\n connect,\n disconnect,\n waitForConnection,\n subscribe,\n unsubscribe,\n channel,\n getChannels,\n on,\n off,\n \n // Утилиты\n formatChannelName,\n extractChannelName,\n getChannelType,\n \n // Константы\n ConnectionStates,\n ChannelTypes,\n };\n}\n\nexport default usePushler;\n","import { usePushler, ConnectionStates, ChannelTypes } from './usePushler';\n\n/**\n * Символ для инъекции Pushler\n */\nexport const PushlerKey = Symbol('pushler');\n\n/**\n * Vue Plugin для глобальной инициализации Pushler\n * \n * Использование:\n * \n * ```js\n * import { createApp } from 'vue';\n * import { PushlerPlugin } from '@pushler/vue';\n * \n * const app = createApp(App);\n * app.use(PushlerPlugin, {\n * appKey: 'your-app-key',\n * autoConnect: true\n * });\n * ```\n * \n * Затем в компонентах:\n * \n * ```js\n * import { inject } from 'vue';\n * import { PushlerKey } from '@pushler/vue';\n * \n * const pushler = inject(PushlerKey);\n * ```\n */\nexport const PushlerPlugin = {\n install(app, options = {}) {\n // Создаем глобальный инстанс Pushler\n const pushler = usePushler(options);\n \n // Предоставляем через provide/inject\n app.provide(PushlerKey, pushler);\n \n // Также добавляем как глобальное свойство (для Options API)\n app.config.globalProperties.$pushler = pushler;\n \n // Экспортируем константы\n app.config.globalProperties.$PushlerConnectionStates = ConnectionStates;\n app.config.globalProperties.$PushlerChannelTypes = ChannelTypes;\n }\n};\n\n/**\n * Хелпер для получения инстанса Pushler в setup()\n */\nexport function usePushlerInstance() {\n const pushler = inject(PushlerKey);\n if (!pushler) {\n throw new Error(\n '[Pushler Vue] No Pushler instance found. ' +\n 'Make sure to install PushlerPlugin or provide a Pushler instance.'\n );\n }\n return pushler;\n}\n\nexport default PushlerPlugin;\n","import { ref, reactive, onUnmounted, watch } from 'vue';\n\n/**\n * Vue composable для работы с отдельным каналом Pushler\n * \n * Можно использовать автономно или совместно с usePushler\n * \n * @param {Object} pushler - Инстанс usePushler\n * @param {string} channelName - Имя канала\n * @param {Object} options - Опции канала\n * @returns {Object} Реактивный объект канала с событиями\n */\nexport function usePushlerChannel(pushler, channelName, options = {}) {\n const channel = ref(null);\n const isSubscribed = ref(false);\n const lastEvent = ref(null);\n const events = reactive([]);\n const eventHandlers = new Map();\n \n /**\n * Максимальное количество событий в буфере\n */\n const maxEvents = options.maxEvents || 100;\n \n /**\n * Подписка на канал\n */\n function subscribe() {\n if (!pushler || !channelName) return;\n \n channel.value = pushler.subscribe(channelName, options);\n \n // Отслеживаем статус подписки\n channel.value.on('subscribed', () => {\n isSubscribed.value = true;\n });\n \n return channel.value;\n }\n \n /**\n * Отписка от канала\n */\n function unsubscribe() {\n if (pushler && channelName) {\n pushler.unsubscribe(channelName);\n channel.value = null;\n isSubscribed.value = false;\n }\n }\n \n /**\n * Подписка на событие канала\n * @param {string} eventName - Имя события\n * @param {Function} callback - Обработчик\n */\n function on(eventName, callback) {\n if (!channel.value) {\n subscribe();\n }\n \n const handler = (data) => {\n // Сохраняем последнее событие\n lastEvent.value = {\n event: eventName,\n data,\n timestamp: new Date()\n };\n \n // Добавляем в буфер событий\n events.unshift(lastEvent.value);\n if (events.length > maxEvents) {\n events.pop();\n }\n \n // Вызываем пользовательский обработчик\n callback(data);\n };\n \n eventHandlers.set(eventName, handler);\n channel.value.on(eventName, handler);\n \n return () => off(eventName);\n }\n \n /**\n * Отписка от события канала\n */\n function off(eventName) {\n if (channel.value && eventHandlers.has(eventName)) {\n channel.value.off(eventName, eventHandlers.get(eventName));\n eventHandlers.delete(eventName);\n }\n }\n \n /**\n * Очистка буфера событий\n */\n function clearEvents() {\n events.length = 0;\n lastEvent.value = null;\n }\n \n // Автоматическая подписка если указано\n if (options.autoSubscribe !== false && pushler?.isConnected?.value) {\n subscribe();\n }\n \n // Подписываемся при подключении\n if (pushler) {\n watch(() => pushler.isConnected.value, (connected) => {\n if (connected && options.autoSubscribe !== false && !channel.value) {\n subscribe();\n }\n });\n }\n \n // Автоматическая отписка при размонтировании\n onUnmounted(() => {\n unsubscribe();\n });\n \n return {\n channel,\n isSubscribed,\n lastEvent,\n events,\n \n subscribe,\n unsubscribe,\n on,\n off,\n clearEvents,\n };\n}\n\nexport default usePushlerChannel;\n"],"names":["ConnectionStates","CONNECTING","CONNECTED","DISCONNECTED","RECONNECTING","FAILED","ChannelTypes","PUBLIC","PRIVATE","PRESENCE","usePushler","options","connectionState","ref","socketId","error","reconnectAttempts","channels","reactive","Map","channelAliases","socket","reconnectTimer","eventListeners","connectionPromise","connectionResolve","connectionReject","appKey","config","wsUrl","authEndpoint","authHeaders","getAuthHeaders","autoConnect","reconnectDelay","maxReconnectAttempts","isConnected","computed","value","isConnecting","isReconnecting","formatChannelName","channelName","startsWith","extractChannelName","fullChannelName","prefix","substring","length","getChannelType","baseName","connect","connectOptions","Promise","resolve","reject","console","log","WebSocket","onopen","onmessage","event","messages","data","trim","split","filter","line","msgData","processMessage","JSON","parse","err","handleMessage","onclose","code","reason","clearTimeout","delay","setTimeout","scheduleReconnect","onerror","Error","message","socket_id","name","channel","entries","subscribed","performChannelSubscription","resubscribeAllChannels","emit","handleConnectionEstablished","get","handleSubscriptionSucceeded","handleAuthSuccess","handleAuthError","handleChannelMessage","disconnect","close","clear","sendMessage","readyState","OPEN","send","stringify","async","type","authData","app_key","signature","headers","dynamicHeaders","Object","assign","getAuthRequestHeaders","hasAuthHeaders","response","fetch","method","credentials","body","channel_name","user_data","user","ok","json","catch","fetchSignature","getAuthData","unsubscribe","delete","on","callback","has","set","push","off","list","idx","indexOf","splice","forEach","cb","onUnmounted","readonly","waitForConnection","timeout","race","_","timeoutId","onConnected","onError","subscribe","subscribeOptions","originalName","listeners","this","getChannels","Array","from","values","map","ch","fullName","PushlerKey","Symbol","PushlerPlugin","install","app","pushler","provide","globalProperties","$pushler","$PushlerConnectionStates","$PushlerChannelTypes","isSubscribed","lastEvent","events","eventHandlers","maxEvents","eventName","autoSubscribe","watch","connected","handler","timestamp","Date","unshift","pop","clearEvents","inject"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pushler/vue",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Vue.js SDK for Pushler.ru real-time messaging",
|
|
6
6
|
"main": "dist/pushler-vue.cjs.js",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
],
|
|
39
39
|
"author": "Pushler.ru <support@pushler.ru>",
|
|
40
40
|
"license": "MIT",
|
|
41
|
-
"homepage": "https://pushler.ru/docs",
|
|
41
|
+
"homepage": "https://pushler.ru/docs#vue-sdk",
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"vue": "^3.0.0"
|
|
44
44
|
},
|
package/src/index.d.ts
CHANGED
|
@@ -31,11 +31,22 @@ export interface PushlerOptions {
|
|
|
31
31
|
appKey?: string;
|
|
32
32
|
wsUrl?: string;
|
|
33
33
|
authEndpoint?: string;
|
|
34
|
+
/** Статические заголовки для авторизации */
|
|
35
|
+
authHeaders?: Record<string, string>;
|
|
36
|
+
/** Функция для динамического получения заголовков авторизации */
|
|
37
|
+
getAuthHeaders?: () => Record<string, string>;
|
|
34
38
|
autoConnect?: boolean;
|
|
35
39
|
reconnectDelay?: number;
|
|
36
40
|
maxReconnectAttempts?: number;
|
|
37
41
|
}
|
|
38
42
|
|
|
43
|
+
/**
|
|
44
|
+
* Результат подключения
|
|
45
|
+
*/
|
|
46
|
+
export interface ConnectionResult {
|
|
47
|
+
socketId: string;
|
|
48
|
+
}
|
|
49
|
+
|
|
39
50
|
/**
|
|
40
51
|
* Опции подписки на канал
|
|
41
52
|
*/
|
|
@@ -90,8 +101,11 @@ export interface UsePushlerReturn {
|
|
|
90
101
|
isReconnecting: ComputedRef<boolean>;
|
|
91
102
|
|
|
92
103
|
// Методы
|
|
93
|
-
|
|
104
|
+
/** Подключение к WebSocket серверу (возвращает Promise) */
|
|
105
|
+
connect(options?: PushlerOptions): Promise<ConnectionResult>;
|
|
94
106
|
disconnect(): void;
|
|
107
|
+
/** Ожидание установления соединения с таймаутом */
|
|
108
|
+
waitForConnection(timeout?: number): Promise<ConnectionResult>;
|
|
95
109
|
subscribe(channelName: string, options?: ChannelOptions): PushlerChannel;
|
|
96
110
|
unsubscribe(channelName: string): void;
|
|
97
111
|
channel(channelName: string): PushlerChannel | undefined;
|
package/src/index.js
CHANGED
|
@@ -9,8 +9,7 @@
|
|
|
9
9
|
* import { usePushler } from '@pushler/vue';
|
|
10
10
|
*
|
|
11
11
|
* const pushler = usePushler({
|
|
12
|
-
* appKey: 'your-app-key'
|
|
13
|
-
* wsUrl: 'wss://ws.pushler.ru/app'
|
|
12
|
+
* appKey: 'your-app-key'
|
|
14
13
|
* });
|
|
15
14
|
*
|
|
16
15
|
* // Подключение
|
|
@@ -40,7 +39,6 @@
|
|
|
40
39
|
* const app = createApp(App);
|
|
41
40
|
* app.use(PushlerPlugin, {
|
|
42
41
|
* appKey: 'your-app-key',
|
|
43
|
-
* wsUrl: 'wss://ws.pushler.ru/app',
|
|
44
42
|
* autoConnect: true
|
|
45
43
|
* });
|
|
46
44
|
* ```
|
package/src/plugin.js
CHANGED
package/src/usePushler.js
CHANGED
|
@@ -27,6 +27,8 @@ export const ChannelTypes = {
|
|
|
27
27
|
* @param {string} options.appKey - Ключ приложения
|
|
28
28
|
* @param {string} options.wsUrl - URL WebSocket сервера
|
|
29
29
|
* @param {string} options.authEndpoint - Эндпоинт авторизации для приватных каналов
|
|
30
|
+
* @param {Object} options.authHeaders - Статические заголовки для авторизации (например, { Authorization: 'Bearer token' })
|
|
31
|
+
* @param {Function} options.getAuthHeaders - Функция для динамического получения заголовков авторизации
|
|
30
32
|
* @param {boolean} options.autoConnect - Автоматическое подключение (по умолчанию false)
|
|
31
33
|
* @param {number} options.reconnectDelay - Задержка переподключения в мс (по умолчанию 1000)
|
|
32
34
|
* @param {number} options.maxReconnectAttempts - Максимум попыток переподключения (по умолчанию 5)
|
|
@@ -48,11 +50,20 @@ export function usePushler(options = {}) {
|
|
|
48
50
|
let reconnectTimer = null;
|
|
49
51
|
const eventListeners = new Map();
|
|
50
52
|
|
|
53
|
+
// Promise для ожидания подключения
|
|
54
|
+
let connectionPromise = null;
|
|
55
|
+
let connectionResolve = null;
|
|
56
|
+
let connectionReject = null;
|
|
57
|
+
|
|
51
58
|
// Конфигурация
|
|
59
|
+
const appKey = options.appKey || '';
|
|
52
60
|
const config = {
|
|
53
|
-
appKey:
|
|
54
|
-
|
|
61
|
+
appKey: appKey,
|
|
62
|
+
// wsUrl формируется автоматически из appKey, но можно переопределить
|
|
63
|
+
wsUrl: options.wsUrl || `wss://ws.pushler.ru/app/${appKey}`,
|
|
55
64
|
authEndpoint: options.authEndpoint || '/pushler/auth',
|
|
65
|
+
authHeaders: options.authHeaders || null,
|
|
66
|
+
getAuthHeaders: options.getAuthHeaders || null,
|
|
56
67
|
autoConnect: options.autoConnect || false,
|
|
57
68
|
reconnectDelay: options.reconnectDelay || 1000,
|
|
58
69
|
maxReconnectAttempts: options.maxReconnectAttempts || 5,
|
|
@@ -96,35 +107,105 @@ export function usePushler(options = {}) {
|
|
|
96
107
|
|
|
97
108
|
/**
|
|
98
109
|
* Подключение к WebSocket серверу
|
|
110
|
+
* @param {Object} connectOptions - Опции подключения
|
|
111
|
+
* @returns {Promise} Promise, который резолвится при успешном подключении
|
|
99
112
|
*/
|
|
100
113
|
function connect(connectOptions = {}) {
|
|
101
114
|
// Обновляем конфигурацию если переданы новые параметры
|
|
102
115
|
if (connectOptions.appKey) config.appKey = connectOptions.appKey;
|
|
103
116
|
if (connectOptions.wsUrl) config.wsUrl = connectOptions.wsUrl;
|
|
104
117
|
if (connectOptions.authEndpoint) config.authEndpoint = connectOptions.authEndpoint;
|
|
118
|
+
if (connectOptions.authHeaders) config.authHeaders = connectOptions.authHeaders;
|
|
119
|
+
if (connectOptions.getAuthHeaders) config.getAuthHeaders = connectOptions.getAuthHeaders;
|
|
105
120
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
return;
|
|
121
|
+
// Если уже подключены - возвращаем резолвленный Promise
|
|
122
|
+
if (connectionState.value === ConnectionStates.CONNECTED) {
|
|
123
|
+
return Promise.resolve({ socketId: socketId.value });
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
// Если уже идёт подключение - возвращаем существующий Promise
|
|
127
|
+
if (connectionState.value === ConnectionStates.CONNECTING && connectionPromise) {
|
|
128
|
+
return connectionPromise;
|
|
109
129
|
}
|
|
110
130
|
|
|
131
|
+
// Создаём новый Promise для ожидания подключения
|
|
132
|
+
connectionPromise = new Promise((resolve, reject) => {
|
|
133
|
+
connectionResolve = resolve;
|
|
134
|
+
connectionReject = reject;
|
|
135
|
+
});
|
|
136
|
+
|
|
111
137
|
connectionState.value = ConnectionStates.CONNECTING;
|
|
112
138
|
error.value = null;
|
|
113
139
|
|
|
114
140
|
try {
|
|
115
|
-
//
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
: `${config.wsUrl}/${config.appKey}`;
|
|
119
|
-
|
|
120
|
-
console.log('[Pushler Vue] Connecting to:', wsUrl);
|
|
121
|
-
socket = new WebSocket(wsUrl);
|
|
141
|
+
// wsUrl уже содержит appKey из конфигурации
|
|
142
|
+
console.log('[Pushler Vue] Connecting to:', config.wsUrl);
|
|
143
|
+
socket = new WebSocket(config.wsUrl);
|
|
122
144
|
setupSocketHandlers();
|
|
123
145
|
} catch (err) {
|
|
124
146
|
console.error('[Pushler Vue] Connection error:', err);
|
|
125
147
|
connectionState.value = ConnectionStates.FAILED;
|
|
126
148
|
error.value = err.message;
|
|
149
|
+
if (connectionReject) {
|
|
150
|
+
connectionReject(err);
|
|
151
|
+
connectionPromise = null;
|
|
152
|
+
connectionResolve = null;
|
|
153
|
+
connectionReject = null;
|
|
154
|
+
}
|
|
127
155
|
}
|
|
156
|
+
|
|
157
|
+
return connectionPromise;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* Ожидание установления соединения
|
|
162
|
+
* @param {number} timeout - Таймаут в мс (по умолчанию 10000)
|
|
163
|
+
* @returns {Promise} Promise с socketId
|
|
164
|
+
*/
|
|
165
|
+
function waitForConnection(timeout = 10000) {
|
|
166
|
+
// Если уже подключены
|
|
167
|
+
if (connectionState.value === ConnectionStates.CONNECTED && socketId.value) {
|
|
168
|
+
return Promise.resolve({ socketId: socketId.value });
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
// Если есть активный Promise подключения
|
|
172
|
+
if (connectionPromise) {
|
|
173
|
+
return Promise.race([
|
|
174
|
+
connectionPromise,
|
|
175
|
+
new Promise((_, reject) =>
|
|
176
|
+
setTimeout(() => reject(new Error('Connection timeout')), timeout)
|
|
177
|
+
)
|
|
178
|
+
]);
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
// Если не подключаемся - начинаем подключение
|
|
182
|
+
if (connectionState.value === ConnectionStates.DISCONNECTED) {
|
|
183
|
+
return connect();
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
// Для других состояний создаём Promise, который ждёт connected события
|
|
187
|
+
return new Promise((resolve, reject) => {
|
|
188
|
+
const timeoutId = setTimeout(() => {
|
|
189
|
+
off('connected', onConnected);
|
|
190
|
+
off('error', onError);
|
|
191
|
+
reject(new Error('Connection timeout'));
|
|
192
|
+
}, timeout);
|
|
193
|
+
|
|
194
|
+
const onConnected = (data) => {
|
|
195
|
+
clearTimeout(timeoutId);
|
|
196
|
+
off('error', onError);
|
|
197
|
+
resolve(data);
|
|
198
|
+
};
|
|
199
|
+
|
|
200
|
+
const onError = (err) => {
|
|
201
|
+
clearTimeout(timeoutId);
|
|
202
|
+
off('connected', onConnected);
|
|
203
|
+
reject(err);
|
|
204
|
+
};
|
|
205
|
+
|
|
206
|
+
on('connected', onConnected);
|
|
207
|
+
on('error', onError);
|
|
208
|
+
});
|
|
128
209
|
}
|
|
129
210
|
|
|
130
211
|
/**
|
|
@@ -154,6 +235,14 @@ export function usePushler(options = {}) {
|
|
|
154
235
|
console.error('[Pushler Vue] WebSocket error:', err);
|
|
155
236
|
connectionState.value = ConnectionStates.FAILED;
|
|
156
237
|
error.value = 'Connection failed';
|
|
238
|
+
|
|
239
|
+
// Реджектим Promise подключения
|
|
240
|
+
if (connectionReject) {
|
|
241
|
+
connectionReject(new Error('Connection failed'));
|
|
242
|
+
connectionPromise = null;
|
|
243
|
+
connectionResolve = null;
|
|
244
|
+
connectionReject = null;
|
|
245
|
+
}
|
|
157
246
|
};
|
|
158
247
|
}
|
|
159
248
|
|
|
@@ -205,6 +294,14 @@ export function usePushler(options = {}) {
|
|
|
205
294
|
|
|
206
295
|
console.log('[Pushler Vue] Connected with socket ID:', socketId.value);
|
|
207
296
|
|
|
297
|
+
// Резолвим Promise подключения
|
|
298
|
+
if (connectionResolve) {
|
|
299
|
+
connectionResolve({ socketId: socketId.value });
|
|
300
|
+
connectionPromise = null;
|
|
301
|
+
connectionResolve = null;
|
|
302
|
+
connectionReject = null;
|
|
303
|
+
}
|
|
304
|
+
|
|
208
305
|
// Переподписка на все каналы
|
|
209
306
|
resubscribeAllChannels();
|
|
210
307
|
|
|
@@ -459,6 +556,24 @@ export function usePushler(options = {}) {
|
|
|
459
556
|
return authData;
|
|
460
557
|
}
|
|
461
558
|
|
|
559
|
+
/**
|
|
560
|
+
* Получение заголовков для авторизации
|
|
561
|
+
*/
|
|
562
|
+
function getAuthRequestHeaders() {
|
|
563
|
+
const headers = { 'Content-Type': 'application/json' };
|
|
564
|
+
|
|
565
|
+
// Динамические заголовки имеют приоритет
|
|
566
|
+
if (typeof config.getAuthHeaders === 'function') {
|
|
567
|
+
const dynamicHeaders = config.getAuthHeaders();
|
|
568
|
+
Object.assign(headers, dynamicHeaders);
|
|
569
|
+
} else if (config.authHeaders) {
|
|
570
|
+
// Статические заголовки
|
|
571
|
+
Object.assign(headers, config.authHeaders);
|
|
572
|
+
}
|
|
573
|
+
|
|
574
|
+
return headers;
|
|
575
|
+
}
|
|
576
|
+
|
|
462
577
|
/**
|
|
463
578
|
* Запрос подписи с бэкенда
|
|
464
579
|
*
|
|
@@ -468,10 +583,15 @@ export function usePushler(options = {}) {
|
|
|
468
583
|
* 3. Вернуть подпись клиенту
|
|
469
584
|
*/
|
|
470
585
|
async function fetchSignature(channel) {
|
|
586
|
+
const headers = getAuthRequestHeaders();
|
|
587
|
+
const hasAuthHeaders = config.authHeaders || config.getAuthHeaders;
|
|
588
|
+
|
|
471
589
|
const response = await fetch(config.authEndpoint, {
|
|
472
590
|
method: 'POST',
|
|
473
|
-
headers
|
|
474
|
-
|
|
591
|
+
headers,
|
|
592
|
+
// Если есть authHeaders, не используем credentials (JWT режим)
|
|
593
|
+
// Если нет — используем cookies для обратной совместимости
|
|
594
|
+
...(hasAuthHeaders ? {} : { credentials: 'include' }),
|
|
475
595
|
body: JSON.stringify({
|
|
476
596
|
channel_name: channel.name,
|
|
477
597
|
socket_id: socketId.value,
|
|
@@ -590,6 +710,7 @@ export function usePushler(options = {}) {
|
|
|
590
710
|
// Методы
|
|
591
711
|
connect,
|
|
592
712
|
disconnect,
|
|
713
|
+
waitForConnection,
|
|
593
714
|
subscribe,
|
|
594
715
|
unsubscribe,
|
|
595
716
|
channel,
|