@signalwire/js 1.3.0-dev.0 → 1.3.0

package/dist/esm/js/src/SignalWire.js

@@ -8,8 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import BrowserSession from '../../common/src/BrowserSession';
+import { Execute } from '../../common/src/messages/Blade';
+import BaseRequest from '../../common/src/messages/verto/BaseRequest';
 import Call from '../../common/src/webrtc/Call';
 export default class SignalWire extends BrowserSession {
+    execute(message) {
+        let msg = message;
+        if (message instanceof BaseRequest) {
+            const params = { message: message.request };
+            if (message.targetNodeId) {
+                params.node_id = message.targetNodeId;
+            }
+            msg = new Execute({ protocol: this.relayProtocol, method: 'message', params });
+        }
+        return super.execute(msg);
+    }
     newCall(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { destinationNumber = null } = options;

package/dist/esm/js/src/Verto.d.ts

@@ -2,21 +2,15 @@ import BrowserSession from '../../common/src/BrowserSession';
 import { SubscribeParams, BroadcastParams } from '../../common/src/util/interfaces';
 import { CallOptions } from '../../common/src/webrtc/interfaces';
 import Call from '../../common/src/webrtc/Call';
-import BaseMessage from '../../common/src/messages/BaseMessage';
+export declare const VERTO_PROTOCOL = "verto-protocol";
 export default class Verto extends BrowserSession {
     relayProtocol: string;
     timeoutErrorCode: number;
-    loginResponse: any;
-    moderator: boolean;
-    superuser: boolean;
     validateOptions(): boolean;
     newCall(options: CallOptions): Call;
-    broadcast(params: BroadcastParams): any;
+    broadcast(params: BroadcastParams): void;
     subscribe(params: SubscribeParams): Promise<any>;
     unsubscribe(params: SubscribeParams): Promise<any>;
-    ping(): any;
-    _wrapInExecute(message: BaseMessage): BaseMessage;
-    vertoLogin(): Promise<any>;
     protected _onSocketOpen(): Promise<void>;
     protected _onSocketMessage(msg: any): void;
 }

package/dist/esm/js/src/Verto.js

@@ -8,20 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import BrowserSession from '../../common/src/BrowserSession';
-import { Login, Ping } from '../../common/src/messages/Verto';
+import { Login } from '../../common/src/messages/Verto';
 import Call from '../../common/src/webrtc/Call';
-import { SwEvent, SESSION_ID, VERTO_PROTOCOL } from '../../common/src/util/constants';
+import { SwEvent, SESSION_ID } from '../../common/src/util/constants';
 import { trigger } from '../../common/src/services/Handler';
 import { localStorage } from '../../common/src/util/storage/';
 import VertoHandler from '../../common/src/webrtc/VertoHandler';
+export const VERTO_PROTOCOL = 'verto-protocol';
 export default class Verto extends BrowserSession {
     constructor() {
         super(...arguments);
         this.relayProtocol = VERTO_PROTOCOL;
         this.timeoutErrorCode = -329990;
-        this.loginResponse = {};
-        this.moderator = false;
-        this.superuser = false;
     }
     validateOptions() {
         const { host, login, passwd, password } = this.options;
@@ -45,60 +43,26 @@ export default class Verto extends BrowserSession {
     unsubscribe(params) {
         return this.vertoUnsubscribe(params);
     }
-    ping() {
-        const msg = new Ping({ serno: Date.now() });
-        return this.execute(msg);
-    }
-    _wrapInExecute(message) {
-        return message;
-    }
-    vertoLogin() {
+    _onSocketOpen() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { login, password, passwd, userVariables, loginParams } = this.options;
-            const msg = new Login({
-                login,
-                passwd: (password || passwd),
-                sessionid: this.sessionid,
-                userVariables,
-                loginParams,
-                callIds: this._experimental ? this.callIds : [],
-            });
+            this._idle = false;
+            const { login, password, passwd, userVariables } = this.options;
+            if (this.sessionid) {
+                const sessidLogin = new Login(undefined, undefined, this.sessionid, undefined);
+                yield this.execute(sessidLogin).catch(console.error);
+            }
+            const msg = new Login(login, (password || passwd), this.sessionid, userVariables);
             const response = yield this.execute(msg).catch(this._handleLoginError);
             if (response) {
                 this._autoReconnect = true;
-                this._idle = false;
-                this.loginResponse = response;
-                this.moderator = response.moderator || false;
-                this.superuser = response.superuser || false;
                 this.sessionid = response.sessid;
-                if (response['auth-expires']) {
-                    this.authorization = {
-                        expires_at: response['auth-expires'],
-                        signature: null,
-                        project: null,
-                        scope_id: null,
-                        scopes: [],
-                        resource: null,
-                    };
-                    this._checkTokenExpiration();
-                }
-                if (!this.incognito) {
-                    localStorage.setItem(SESSION_ID, this.sessionid);
-                }
-            }
-            return response;
-        });
-    }
-    _onSocketOpen() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._idle = false;
-            const response = yield this.vertoLogin();
-            if (response) {
+                localStorage.setItem(SESSION_ID, this.sessionid);
                 trigger(SwEvent.Ready, this, this.uuid);
             }
         });
     }
     _onSocketMessage(msg) {
-        VertoHandler(this, msg);
+        const handler = new VertoHandler(this);
+        handler.handleMessage(msg);
     }
 }