vani-meeting-client 0.3.5 → 0.3.6

package/lib/MeetingHandler.js

@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { VaniEvent, MeetingStartRequest } from ".";
+import { VaniEvent, MeetingStartRequest, ChatSendVia } from ".";
 import { DynamicLibHelper } from "./utility/DynamicLibHelper";
 import * as log from 'loglevel';
 import { WebSocketBasicEvents, WebsocketHandler } from "./websocket-handler/WebsocketHandler";
@@ -303,7 +303,7 @@ var MeetingHandler = /** @class */ (function () {
     };
     ///Messages
     MeetingHandler.prototype.sendMessage = function (message) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!message.sender) {
             message.sender = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
         }
@@ -317,7 +317,12 @@ var MeetingHandler = /** @class */ (function () {
         else {
             var to = message.to === "all" ? this.meetingStartRequest.roomId : message.to;
             var messageObj = { type: "chat", message: message.toJsonObjectForSending(), to: to, shouldPresist: message.shouldPresist };
-            (_b = this.websocketCallHandler) === null || _b === void 0 ? void 0 : _b.sendSocketMessage(WebSocketBasicEvents.Message, messageObj);
+            if (message.chatSendVia === ChatSendVia.DataChannel) {
+                (_b = this.videoCallHandler) === null || _b === void 0 ? void 0 : _b.sendMessageViaDataChannel(messageObj);
+            }
+            else {
+                (_c = this.websocketCallHandler) === null || _c === void 0 ? void 0 : _c.sendSocketMessage(WebSocketBasicEvents.Message, messageObj);
+            }
             return { message: "Message Sent", error: 'NoError', isSuccess: true };
         }
     };

package/lib/model/MeetingStartRequest.d.ts

@@ -36,6 +36,7 @@ export declare class MeetingStartRequest {
     defaultScreenShareBlocked: boolean;
     defaultCameraFacingMode: CameraFacingMode;
     simulcastEncodings: RTCRtpEncodingParameters[];
+    isDataChannelRequired: boolean;
     urlToCheckInternetPresent: string;
     constructor(_roomId: string, _userId: string, _appId: string, _wssUrl: string);
 }

package/lib/model/MeetingStartRequest.js

@@ -31,6 +31,7 @@ var MeetingStartRequest = /** @class */ (function () {
         this.defaultScreenShareBlocked = false;
         this.defaultCameraFacingMode = CameraFacingMode.Front;
         this.simulcastEncodings = [{ maxBitrate: 40000, scaleResolutionDownBy: 2.0 }, { maxBitrate: 620000, scaleResolutionDownBy: 1.0 },];
+        this.isDataChannelRequired = false;
         this.urlToCheckInternetPresent = "https://en.wikipedia.org/w/api.php?format=json&action=query&prop=extracts&exintro&explaintext&redirects=1&titles=Stack%20Overflow";
         this.roomId = _roomId;
         this.userId = _userId;

package/lib/model/MessagePayload.d.ts

@@ -4,6 +4,10 @@ export declare enum ChatMessageType {
     File = "file",
     Info = "info"
 }
+export declare enum ChatSendVia {
+    WebSocket = "WebSocket",
+    DataChannel = "DataChannel"
+}
 export declare class MessagePayload {
     message: string;
     to: string;
@@ -13,6 +17,7 @@ export declare class MessagePayload {
     sender?: Participant;
     shouldPresist: boolean;
     time: number;
+    chatSendVia: ChatSendVia;
     constructor(_message: string);
     constructor(_message: string, _to: string);
     toJsonObjectForSending(): {

package/lib/model/MessagePayload.js

@@ -4,6 +4,11 @@ export var ChatMessageType;
     ChatMessageType["File"] = "file";
     ChatMessageType["Info"] = "info";
 })(ChatMessageType || (ChatMessageType = {}));
+export var ChatSendVia;
+(function (ChatSendVia) {
+    ChatSendVia["WebSocket"] = "WebSocket";
+    ChatSendVia["DataChannel"] = "DataChannel";
+})(ChatSendVia || (ChatSendVia = {}));
 var MessagePayload = /** @class */ (function () {
     function MessagePayload(_message, _to, _sender, _type) {
         if (_to === void 0) { _to = "all"; }
@@ -12,6 +17,7 @@ var MessagePayload = /** @class */ (function () {
         this.extraData = {};
         this.shouldPresist = false;
         this.time = new Date().getTime();
+        this.chatSendVia = ChatSendVia.WebSocket;
         this.message = _message;
         this.to = _to;
         this.sender = _sender;

package/lib/model/Track.d.ts

@@ -4,7 +4,8 @@ export declare enum TrackKind {
     Audio = "Audio",
     ScreenshareVideo = "ScreenshareVideo",
     ScreenshareAudio = "ScreenshareAudio",
-    LocalVideo = "LocalVideo"
+    LocalVideo = "LocalVideo",
+    DataChannel = "DataChannel"
 }
 export declare class Track {
     trackId: string;

package/lib/model/Track.js

@@ -5,6 +5,7 @@ export var TrackKind;
     TrackKind["ScreenshareVideo"] = "ScreenshareVideo";
     TrackKind["ScreenshareAudio"] = "ScreenshareAudio";
     TrackKind["LocalVideo"] = "LocalVideo";
+    TrackKind["DataChannel"] = "DataChannel";
 })(TrackKind || (TrackKind = {}));
 var Track = /** @class */ (function () {
     function Track(_participant, _isLocalTrack, _trackKind, _track) {

package/lib/video-call-handler/BaseVideoCallHandler.d.ts

@@ -14,6 +14,7 @@ export declare abstract class BaseVideoCallHandler extends Base {
     abstract pauseIncomingTrack(track: Track): void;
     abstract onParticipantUpdated(): void;
     abstract createDataChannel(): any;
+    abstract sendMessageViaDataChannel(messagePayload: any): any;
     updateSpatialForTrack(track: Track, spatialLayerIndex: number): Promise<void>;
     reconnectedWithoutPing(): void;
     cleanup(): void;

package/lib/video-call-handler/SFUHandler.d.ts

@@ -22,6 +22,7 @@ export declare class SFUHandler extends BaseVideoCallHandler {
     sendTrack(track: Track): Promise<void>;
     createDataChannel(): Promise<void>;
     onParticipantUpdated(): void;
+    sendMessageViaDataChannel(messagePayload: any): void;
     init(): Promise<void>;
     private onTransportNotFound;
     private addObserverForDevice;

package/lib/video-call-handler/SFUHandler.js

@@ -198,7 +198,6 @@ var SFUHandler = /** @class */ (function (_super) {
                         if (webcamProducer) {
                             this.producers.push(webcamProducer);
                             this.onParticipantUpdated();
-                            this.createDataChannel();
                             // this.sendMessageReadyToConsume();
                         }
                         _d.label = 4;
@@ -208,20 +207,21 @@ var SFUHandler = /** @class */ (function (_super) {
         });
     };
     SFUHandler.prototype.createDataChannel = function () {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var webcamProducer;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var track, webcamProducer;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!(this.dataProducers.length === 0)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = this.sendTransport) === null || _a === void 0 ? void 0 : _a.produceData())];
+                        track = new Track((_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant(), true, TrackKind.DataChannel, undefined);
+                        return [4 /*yield*/, ((_b = this.sendTransport) === null || _b === void 0 ? void 0 : _b.produceData({ appData: track }))];
                     case 1:
-                        webcamProducer = _b.sent();
+                        webcamProducer = _c.sent();
                         if (webcamProducer) {
                             this.dataProducers.push(webcamProducer);
                         }
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
@@ -239,6 +239,11 @@ var SFUHandler = /** @class */ (function (_super) {
             });
         }
     };
+    SFUHandler.prototype.sendMessageViaDataChannel = function (messagePayload) {
+        if (this.dataProducers && this.dataProducers.length > 0) {
+            this.dataProducers[0].send(messagePayload);
+        }
+    };
     SFUHandler.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
             var messageJson;
@@ -308,16 +313,16 @@ var SFUHandler = /** @class */ (function (_super) {
             this.sendTransport = this.device.createSendTransport(transport);
             this.sendTransport.on('produce', function (producerLocalParameters, callback, errback) {
                 var _a;
-                _this.transportCallBacks[_this.sendTransport.id] = callback;
+                _this.transportCallBacks[producerLocalParameters.appData.trackId] = callback;
                 var messageJson = { to: "self", type: SFUMessageType.OnTransportProduceSyncRequest, message: { type: producerLocalParameters.appData.type, transportId: (_a = _this.sendTransport) === null || _a === void 0 ? void 0 : _a.id, kind: producerLocalParameters.kind, rtpParameters: producerLocalParameters.rtpParameters, appData: producerLocalParameters.appData } };
                 _this.sendSFUMessageToSocket(messageJson);
             });
-            transport.on("producedata", function (producerLocalParameters, callback, errback) { return __awaiter(_this, void 0, void 0, function () {
+            this.sendTransport.on("producedata", function (producerLocalParameters, callback, errback) { return __awaiter(_this, void 0, void 0, function () {
                 var messageJson;
                 var _a;
                 return __generator(this, function (_b) {
-                    this.transportCallBacks[this.sendTransport.id] = callback;
-                    messageJson = { to: "self", type: SFUMessageType.OnTransportProduceSyncRequest, message: { type: producerLocalParameters.appData.type, transportId: (_a = this.sendTransport) === null || _a === void 0 ? void 0 : _a.id, kind: producerLocalParameters.kind, rtpParameters: producerLocalParameters.rtpParameters, appData: producerLocalParameters.appData } };
+                    this.transportCallBacks[producerLocalParameters.appData.trackId] = callback;
+                    messageJson = { to: "self", type: SFUMessageType.OnTransportDataProduceSyncRequest, message: { type: 'send', transportId: (_a = this.sendTransport) === null || _a === void 0 ? void 0 : _a.id, sctpStreamParameters: producerLocalParameters.sctpStreamParameters, label: producerLocalParameters.label, appData: producerLocalParameters.appData } };
                     this.sendSFUMessageToSocket(messageJson);
                     return [2 /*return*/];
                 });
@@ -347,7 +352,7 @@ var SFUHandler = /** @class */ (function (_super) {
     };
     SFUHandler.prototype.produceTracks = function () {
         var _this = this;
-        var _a;
+        var _a, _b;
         log.info("produceTracks");
         if (!this.sendTransport || !this.consumerTransport == null || this.isProduceTrackIntialWorkDone) {
             return;
@@ -363,15 +368,18 @@ var SFUHandler = /** @class */ (function (_super) {
         else {
             this.sendMessageReadyToConsume();
         }
+        if ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.isDataChannelRequired) {
+            this.createDataChannel();
+        }
     };
     SFUHandler.prototype.onProduceSyncDone = function (data) {
-        if (data.message.transportId && data.message.producerId) {
+        if (data.message.appData && data.message.appData.trackId && data.message.producerId) {
             var transportId = data.message.transportId;
-            var callBack = this.transportCallBacks[transportId];
+            var callBack = this.transportCallBacks[data.message.appData.trackId];
             if (callBack) {
                 var id = data.message.producerId;
                 callBack({ id: id });
-                delete this.transportCallBacks[transportId];
+                delete this.transportCallBacks[data.message.appData.trackId];
             }
         }
     };
@@ -426,6 +434,11 @@ var SFUHandler = /** @class */ (function (_super) {
                 if (track) {
                     (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.removeTrack(track);
                 }
+                consumer.close();
+                var index = this.consumers.indexOf(consumer);
+                if (index > -1) {
+                    this.consumers.splice(index, 1);
+                }
             }
         }
     };
@@ -441,7 +454,12 @@ var SFUHandler = /** @class */ (function (_super) {
                     consumerAppData = __assign({}, this.consumerTransport.appData);
                     consumerAppData.producerData = producer.appData;
                     consumerAppData.producerData.producerId = producerId;
-                    cosumeObj = { producerId: producerId, rtpCapabilities: this.routerRtpCapabilities, paused: true, appData: consumerAppData, transportId: this.consumerTransport.id, type: "consume" };
+                    producer.appData = consumerAppData;
+                    cosumeObj = {
+                        producerId: producerId, rtpCapabilities: this.routerRtpCapabilities, rtpParameters: data.message.producer.rtpParameters,
+                        paused: true, appData: consumerAppData, transportId: this.consumerTransport.id, type: "consume",
+                        sctpStreamParameters: data.message.producer.sctpStreamParameters, label: data.message.producer.label, protocol: data.message.producer.protocol
+                    };
                     message = { to: "self", type: SFUMessageType.ConsumeProductId, message: cosumeObj };
                     this.sendSFUMessageToSocket(message);
                 }
@@ -451,27 +469,38 @@ var SFUHandler = /** @class */ (function (_super) {
     };
     SFUHandler.prototype.onServerConsumer = function (data) {
         return __awaiter(this, void 0, void 0, function () {
-            var consumerObj;
+            var consumerObj, consumerObj;
             var _this = this;
             return __generator(this, function (_a) {
                 log.info("onServerConsumer");
                 log.info(data);
                 if (this.consumerTransport && data && data.message && data.message.consumer) {
-                    consumerObj = data.message.consumer;
-                    this.consumerTransport.consume(consumerObj).then(function (consumer) {
-                        var _a, _b;
-                        _this.consumers.push(consumer);
-                        var mediaTrack = consumer.track;
-                        var data = consumer.appData.producerData;
-                        log.info(data);
-                        var participant = (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.addParticipantIfNotExist(data.participant, true);
-                        if (participant) {
-                            var track = new Track(participant, false, data.trackKind, mediaTrack);
-                            (_b = _this.communicationHandler) === null || _b === void 0 ? void 0 : _b.addUpdateRemoteTrack(track, participant, true);
-                        }
-                        var messageJson = { to: "self", type: SFUMessageType.ResumeConsumer, message: { id: consumer.id } };
-                        _this.sendSFUMessageToSocket(messageJson);
-                    });
+                    if (data.message.consumer.appData.producerData.trackKind === TrackKind.DataChannel) {
+                        consumerObj = data.message.consumer;
+                        this.consumerTransport.consumeData(consumerObj).then(function (consumer) {
+                            _this.dataConsumer.push(consumer);
+                            consumer.on("message", function (message, ppid) {
+                                console.log("OnMessage Data Channel", message);
+                            });
+                        });
+                    }
+                    else {
+                        consumerObj = data.message.consumer;
+                        this.consumerTransport.consume(consumerObj).then(function (consumer) {
+                            var _a, _b;
+                            _this.consumers.push(consumer);
+                            var mediaTrack = consumer.track;
+                            var data = consumer.appData.producerData;
+                            log.info(data);
+                            var participant = (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.addParticipantIfNotExist(data.participant, true);
+                            if (participant) {
+                                var track = new Track(participant, false, data.trackKind, mediaTrack);
+                                (_b = _this.communicationHandler) === null || _b === void 0 ? void 0 : _b.addUpdateRemoteTrack(track, participant, true);
+                            }
+                            var messageJson = { to: "self", type: SFUMessageType.ResumeConsumer, message: { id: consumer.id } };
+                            _this.sendSFUMessageToSocket(messageJson);
+                        });
+                    }
                 }
                 return [2 /*return*/];
             });
@@ -501,6 +530,16 @@ var SFUHandler = /** @class */ (function (_super) {
                 producer.close();
             }
         });
+        this.dataProducers.forEach(function (producer) {
+            if (producer.closed === false) {
+                producer.close();
+            }
+        });
+        this.dataConsumer.forEach(function (consumer) {
+            if (consumer.closed === false) {
+                consumer.close();
+            }
+        });
         this.consumers.forEach(function (consumer) {
             if (consumer.closed === false) {
                 consumer.close();

package/lib/video-call-handler/WebrtcHandler.d.ts

@@ -13,4 +13,5 @@ export declare class WebrtcHandler extends BaseVideoCallHandler {
     resumeTrack(track: Track): void;
     sendTrack(track: Track): void;
     createDataChannel(): Promise<void>;
+    sendMessageViaDataChannel(messagePayload: any): void;
 }

package/lib/video-call-handler/WebrtcHandler.js

@@ -98,6 +98,9 @@ var WebrtcHandler = /** @class */ (function (_super) {
             });
         });
     };
+    WebrtcHandler.prototype.sendMessageViaDataChannel = function (messagePayload) {
+        throw new Error('Method not implemented.');
+    };
     return WebrtcHandler;
 }(BaseVideoCallHandler));
 export { WebrtcHandler };

package/lib/websocket-handler/WebsocketHandler.d.ts

@@ -36,6 +36,7 @@ export declare enum SFUMessageType {
     OnSendTransport = "onSendTransport",
     OnConsumeTransport = "onConsumeTransport",
     OnTransportProduceSyncRequest = "transportProduceSync",
+    OnTransportDataProduceSyncRequest = "dataTransportProduceSync",
     OnReadyToConsume = "readyToConsume",
     OnProducerClosed = "producerClosed",
     OnPauseProducer = "pauseProducer",

package/lib/websocket-handler/WebsocketHandler.js

@@ -92,6 +92,7 @@ export var SFUMessageType;
     SFUMessageType["OnSendTransport"] = "onSendTransport";
     SFUMessageType["OnConsumeTransport"] = "onConsumeTransport";
     SFUMessageType["OnTransportProduceSyncRequest"] = "transportProduceSync";
+    SFUMessageType["OnTransportDataProduceSyncRequest"] = "dataTransportProduceSync";
     SFUMessageType["OnReadyToConsume"] = "readyToConsume";
     SFUMessageType["OnProducerClosed"] = "producerClosed";
     SFUMessageType["OnPauseProducer"] = "pauseProducer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vani-meeting-client",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Vani Meeting Clinet SDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",