@ermis-network/ermis-chat-sdk 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ermis-network/ermis-chat-sdk",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Ermis Chat SDK",
   "author": "Ermis",
   "homepage": "https://ermis.network/",
@@ -26,6 +26,9 @@
       "require": "./dist/index.cjs"
     }
   },
+  "bin": {
+    "ermis-init-call": "./bin/init-call.js"
+  },
   "jsdelivr": "./dist/index.browser.full-bundle.min.js",
   "license": "SEE LICENSE IN LICENSE",
   "keywords": [
@@ -40,7 +43,9 @@
     "/dist",
     "/src",
     "readme.md",
-    "license"
+    "license",
+    "/bin",
+    "/public"
   ],
   "dependencies": {
     "@types/event-source-polyfill": "^1.0.5",

package/src/client.ts

@@ -1192,11 +1192,13 @@ export class ErmisChat<ErmisChatGenerics extends ExtendableGenerics = DefaultGen
     return await this.post<APIResponse>(this.baseURL + `/channels/${channelType}/${channelId}/unpin`);
   }
 
+  channel(type: string, custom?: ChannelData<ErmisChatGenerics>): Channel<ErmisChatGenerics>;
+  channel(type: string, id: string, custom?: ChannelData<ErmisChatGenerics>): Channel<ErmisChatGenerics>;
   channel(
     channelType: string,
-    channelID: string,
-    custom: ChannelData<ErmisChatGenerics> = {} as ChannelData<ErmisChatGenerics>,
-  ) {
+    channelIDOrCustom?: string | ChannelData<ErmisChatGenerics>,
+    custom?: ChannelData<ErmisChatGenerics>,
+  ): Channel<ErmisChatGenerics> {
     if (!this.userID) {
       throw Error('Call connectUser before creating a channel');
     }
@@ -1205,11 +1207,20 @@ export class ErmisChat<ErmisChatGenerics extends ExtendableGenerics = DefaultGen
       throw Error(`Invalid channel group ${channelType}, can't contain the : character`);
     }
 
-    return this.getChannelById(channelType, channelID, custom);
+    let channelID: string | undefined = undefined;
+    let customData = custom || ({} as ChannelData<ErmisChatGenerics>);
+
+    if (typeof channelIDOrCustom === 'string') {
+      channelID = channelIDOrCustom;
+    } else if (typeof channelIDOrCustom === 'object' && channelIDOrCustom !== null) {
+      customData = channelIDOrCustom as ChannelData<ErmisChatGenerics>;
+    }
+
+    return this.getChannelById(channelType, channelID, customData);
   }
 
-  getChannelById = (channelType: string, channelID: string, custom: ChannelData<ErmisChatGenerics>) => {
-    const cid = `${channelType}:${channelID}`;
+  getChannelById = (channelType: string, channelID: string | undefined, custom: ChannelData<ErmisChatGenerics>) => {
+    const cid = `${channelType}:${channelID || ''}`;
     if (cid in this.activeChannels && !this.activeChannels[cid].disconnected) {
       const channel = this.activeChannels[cid];
       if (Object.keys(custom).length > 0) {

package/src/ermis_call_node.ts

@@ -335,28 +335,46 @@ export class ErmisCallNode<ErmisChatGenerics extends ExtendableGenerics = Defaul
     const mediaConstraints = await this.getMediaConstraints();
 
     try {
-      // Request the media stream with the determined constraints
       const stream = await navigator.mediaDevices.getUserMedia(mediaConstraints);
-      if (this.callStatus === CallStatus.ENDED) {
-        // If the call has ended, stop the local stream tracks
-        stream.getTracks().forEach((track) => track.stop());
-        this.destroy();
-        return;
+      return this.applyLocalStream(stream);
+    } catch (error: any) {
+      console.warn('Error getting user media:', error?.message);
+
+      // Video call: try fallback to audio-only (camera not available)
+      if (this.callType === 'video' && mediaConstraints.video) {
+        try {
+          const audioOnlyStream = await navigator.mediaDevices.getUserMedia({
+            audio: mediaConstraints.audio,
+            video: false,
+          });
+          this.setConnectionMessage('Camera not available, using audio only');
+          return this.applyLocalStream(audioOnlyStream);
+        } catch {
+          // Audio fallback also failed
+        }
       }
-      if (this.onLocalStream) {
-        this.onLocalStream(stream);
+
+      // No device found at all — report error
+      if (typeof this.onError === 'function') {
+        this.onError('No microphone or camera found. Please check your device.');
       }
-      this.localStream = stream;
-      return stream;
-    } catch (error) {
-      console.error('Error getting user media:', error);
-      // if (typeof this.onError === 'function') {
-      //   this.onError('Unable to access microphone/camera');
-      // }
       return null;
     }
   }
 
+  private applyLocalStream(stream: MediaStream) {
+    if (this.callStatus === CallStatus.ENDED) {
+      stream.getTracks().forEach((track) => track.stop());
+      this.destroy();
+      return;
+    }
+    if (this.onLocalStream) {
+      this.onLocalStream(stream);
+    }
+    this.localStream = stream;
+    return stream;
+  }
+
   private setConnectionMessage(message: string | null) {
     if (typeof this.onConnectionMessageChange === 'function') {
       this.onConnectionMessageChange(message);
@@ -415,23 +433,12 @@ export class ErmisCallNode<ErmisChatGenerics extends ExtendableGenerics = Defaul
           this.isDestroyed = false;
           this.callStatus = '';
           this.callType = is_video ? 'video' : 'audio';
-          await this.startLocalStream();
-          if (this.callStatus === CallStatus.ENDED) return;
+
           this.setUserInfo(cid, eventUserId);
           this.setCallStatus(CallStatus.RINGING);
           this.cid = cid || '';
           this.metadata = metadata || {};
 
-          console.log('----metadata---', metadata);
-          if (eventUserId !== this.userID) {
-            await this.initialize();
-          }
-
-          if (this.localStream && this.mediaSender && this.mediaReceiver) {
-            this.mediaSender?.initEncoders(this.localStream);
-            this.mediaReceiver?.initDecoders(this.callType);
-          }
-
           if (typeof this.onCallEvent === 'function') {
             this.onCallEvent({
               type: eventUserId !== this.userID ? 'incoming' : 'outgoing',
@@ -443,6 +450,18 @@ export class ErmisCallNode<ErmisChatGenerics extends ExtendableGenerics = Defaul
             });
           }
 
+          await this.startLocalStream();
+          if (this.callStatus === CallStatus.ENDED) return;
+
+          if (eventUserId !== this.userID) {
+            await this.initialize();
+          }
+
+          if (this.localStream && this.mediaSender && this.mediaReceiver) {
+            this.mediaSender?.initEncoders(this.localStream);
+            this.mediaReceiver?.initDecoders(this.callType);
+          }
+
           if (eventUserId === this.userID) {
             // Set missCall timeout if no connection after 60s
             if (this.missCallTimeout) clearTimeout(this.missCallTimeout);
@@ -782,29 +801,40 @@ export class ErmisCallNode<ErmisChatGenerics extends ExtendableGenerics = Defaul
   public async stopScreenShare() {
     const mediaConstraints = await this.getMediaConstraints();
 
-    const cameraStream = await navigator.mediaDevices.getUserMedia(mediaConstraints);
-    const cameraTrack = cameraStream.getVideoTracks()[0];
+    try {
+      // Only request video; we already have an active audio track in localStream
+      const cameraStream = await navigator.mediaDevices.getUserMedia({
+        video: mediaConstraints.video,
+        audio: false,
+      });
+      const cameraTrack = cameraStream.getVideoTracks()[0];
 
-    // Replace video track in localStream
-    if (this.localStream) {
-      // Stop old track (screen)
-      this.localStream.getVideoTracks().forEach((track) => track.stop());
-      // Replace with camera track
-      this.localStream.removeTrack(this.localStream.getVideoTracks()[0]);
-      this.localStream.addTrack(cameraTrack);
-    } else {
-      this.localStream = cameraStream;
-    }
+      // Replace video track in localStream
+      if (this.localStream) {
+        // Stop old screen tracks
+        this.localStream.getVideoTracks().forEach((track) => {
+          track.stop();
+          this.localStream?.removeTrack(track);
+        });
+        
+        // Add new camera track
+        this.localStream.addTrack(cameraTrack);
+      } else {
+        this.localStream = cameraStream;
+      }
 
-    // Call callback if UI needs to update
-    if (this.onLocalStream) {
-      this.onLocalStream(this.localStream);
-      this.mediaSender?.replaceVideoTrack(this.localStream.getVideoTracks()[0]);
-    }
+      // Call callback if UI needs to update
+      if (this.onLocalStream) {
+        this.onLocalStream(this.localStream);
+        this.mediaSender?.replaceVideoTrack(this.localStream.getVideoTracks()[0]);
+      }
 
-    // Call callback when screen sharing stops
-    if (typeof this.onScreenShareChange === 'function') {
-      this.onScreenShareChange(false);
+      // Call callback when screen sharing stops
+      if (typeof this.onScreenShareChange === 'function') {
+        this.onScreenShareChange(false);
+      }
+    } catch (error) {
+      console.error('Error stopping screen share and reverting to camera:', error);
     }
   }
 

package/src/index.ts

@@ -10,6 +10,7 @@ export * from './ermis_call_node';
 export * from './auth';
 export { chatCodes, logChatPromiseExecution, formatMessage, createForwardMessagePayload } from './utils';
 export { parseSystemMessage } from './system_message';
-export { parseSignalMessage } from './signal_message';
+export { parseSignalMessage, CallType } from './signal_message';
+export type { SignalMessageResult, CallTypeValue } from './signal_message';
 export { normalizeFileName, getAttachmentCategory, isVideoFile, isHeicFile, buildAttachmentPayload } from './attachment_utils';
 export type { VoiceRecordingMeta } from './attachment_utils';

package/src/signal_message.ts

@@ -1,96 +1,146 @@
 /**
- * Convert duration in seconds to mm:ss format.
+ * Call type constants for signal messages.
  */
-function formatDuration(durationSec: string): string {
-  const sec = parseInt(durationSec, 10);
-  if (isNaN(sec) || sec < 0) return durationSec;
-  const minutes = Math.floor(sec / 60);
-  const seconds = sec % 60;
-  return `${minutes}:${seconds.toString().padStart(2, '0')}`;
+export const CallType = {
+  AUDIO: 'audio',
+  VIDEO: 'video',
+} as const;
+
+export type CallTypeValue = (typeof CallType)[keyof typeof CallType];
+
+/**
+ * Result of parsing a signal message.
+ */
+export interface SignalMessageResult {
+  text: string;
+  duration: string;
+  callType: CallTypeValue | '';
+  color: string;
 }
 
 /**
- * Resolve a user ID to a display name using the provided map.
- * Falls back to the raw userId if no entry is found.
+ * Format duration from milliseconds to "X min, Y sec" format.
  */
-function resolveUser(userId: string, userMap: Record<string, string>): string {
-  return userMap[userId] ?? userId;
+function formatDuration(durationMs: string): string {
+  if (!durationMs) return '';
+  const ms = parseInt(durationMs, 10);
+  if (isNaN(ms) || ms <= 0) return '';
+  const totalSeconds = Math.floor(ms / 1000);
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  return `${minutes} min, ${seconds} sec`;
 }
 
 /**
- * Parse a raw signal message string into a human-readable English sentence.
+ * Parse a raw signal message string into a structured object
+ * containing text, duration, call type, and color.
  *
  * Signal messages represent call events. The raw format is:
- * `"<formatId> <userID> [<param1> <param2> ...]"`
+ * `"<formatId> <callerId> [<enderId> <duration>]"`
  *
- * @param value   - Raw signal message string from the server
- * @param userMap - Mapping of user IDs → display names
- * @returns         Parsed English text, or the original string if unknown
+ * @param value    - Raw signal message string from the server
+ * @param myUserId - The current user's ID (from client.userID)
+ * @returns          Parsed signal message object, or null if input is empty
  */
 export function parseSignalMessage(
   value: string,
-  userMap: Record<string, string>,
-): string {
-  if (!value || typeof value !== 'string') return value ?? '';
+  myUserId: string,
+): SignalMessageResult | null {
+  if (!value || typeof value !== 'string') return null;
 
   const trimmed = value.trim();
-  if (!trimmed) return '';
+  if (!trimmed) return null;
 
   const parts = trimmed.split(' ');
-  const formatId = parts[0];
-  const userId = parts[1] ?? '';
-  const userName = userId ? resolveUser(userId, userMap) : 'User';
-
-  switch (formatId) {
-    // 1: Audio call started
-    case '1':
-      return `📞 ${userName} started an audio call.`;
-
-    // 2: Audio call missed
-    case '2':
-      return `📞 Missed audio call from ${userName}.`;
-
-    // 3: Audio call ended (caller_id ender_id duration)
-    case '3': {
-      const enderId = parts[2] ?? '';
-      const duration = parts[3] ?? '0';
-      const enderName = enderId ? resolveUser(enderId, userMap) : 'User';
-      return `📞 Audio call by ${userName}, ended by ${enderName}. Duration: ${formatDuration(duration)}.`;
-    }
+  const number = parseInt(parts[0], 10);
+  const callerId = parts[1] ?? '';
+  const isMe = myUserId === callerId;
 
-    // 4: Video call started
-    case '4':
-      return `📹 ${userName} started a video call.`;
+  let enderId = '';
+  let duration = '';
+  let callType: CallTypeValue | '' = '';
+  let color = '';
 
-    // 5: Video call missed
-    case '5':
-      return `📹 Missed video call from ${userName}.`;
-
-    // 6: Video call ended (caller_id ender_id duration)
-    case '6': {
-      const enderId = parts[2] ?? '';
-      const duration = parts[3] ?? '0';
-      const enderName = enderId ? resolveUser(enderId, userMap) : 'User';
-      return `📹 Video call by ${userName}, ended by ${enderName}. Duration: ${formatDuration(duration)}.`;
-    }
-
-    // 7: Audio call rejected
-    case '7':
-      return `📞 Audio call from ${userName} was rejected.`;
-
-    // 8: Video call rejected
-    case '8':
-      return `📹 Video call from ${userName} was rejected.`;
-
-    // 9: Audio call busy
-    case '9':
-      return `📞 Audio call from ${userName} — recipient was busy.`;
-
-    // 10: Video call busy
-    case '10':
-      return `📹 Video call from ${userName} — recipient was busy.`;
+  if (number === 3 || number === 6) {
+    enderId = parts[2] ?? '';
+    duration = parts[3] === '0' ? '' : (parts[3] ?? '');
+  }
 
+  let text: string;
+  switch (number) {
+    case 1: // AudioCallStarted
+      text = isMe ? 'Calling...' : 'Incoming audio call...';
+      callType = CallType.AUDIO;
+      color = '#54D62C';
+      break;
+    case 2: // AudioCallMissed
+      text = isMe ? 'Outgoing audio call' : 'You missed audio call';
+      callType = CallType.AUDIO;
+      color = '#FF4842';
+      break;
+    case 3: // AudioCallEnded
+      if (duration) {
+        text = isMe ? 'Outgoing audio call' : 'Incoming audio call';
+        color = '#54D62C';
+      } else {
+        if (enderId === myUserId) {
+          text = 'You cancel audio call';
+        } else {
+          text = 'You missed audio call';
+        }
+        color = '#FF4842';
+      }
+      callType = CallType.AUDIO;
+      break;
+    case 4: // VideoCallStarted
+      text = isMe ? 'Calling...' : 'Incoming video call...';
+      callType = CallType.VIDEO;
+      color = '#54D62C';
+      break;
+    case 5: // VideoCallMissed
+      text = isMe ? 'Outgoing video call' : 'You missed video call';
+      callType = CallType.VIDEO;
+      color = '#FF4842';
+      break;
+    case 6: // VideoCallEnded
+      if (duration) {
+        text = isMe ? 'Outgoing video call' : 'Incoming video call';
+        color = '#54D62C';
+      } else {
+        if (enderId === myUserId) {
+          text = 'You cancel video call';
+        } else {
+          text = 'You missed video call';
+        }
+        color = '#FF4842';
+      }
+      callType = CallType.VIDEO;
+      break;
+    case 7: // AudioCallRejected
+      text = isMe ? 'Recipient rejected audio call' : 'You rejected audio call';
+      callType = CallType.AUDIO;
+      color = '#FF4842';
+      break;
+    case 8: // VideoCallRejected
+      text = isMe ? 'Recipient rejected video call' : 'You rejected video call';
+      callType = CallType.VIDEO;
+      color = '#FF4842';
+      break;
+    case 9: // AudioCallBusy
+      text = isMe ? 'Recipient was busy' : 'You missed audio call';
+      callType = CallType.AUDIO;
+      color = '#FF4842';
+      break;
+    case 10: // VideoCallBusy
+      text = isMe ? 'Recipient was busy' : 'You missed video call';
+      callType = CallType.VIDEO;
+      color = '#FF4842';
+      break;
     default:
-      return trimmed;
+      text = trimmed;
+      callType = '';
+      color = '';
   }
+
+  return { text, duration: formatDuration(duration), callType, color };
 }