@wildix/xbees-connect 1.2.0-alpha.9 → 1.2.1

package/dist-es/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wildix/xbees-connect",
-    "version": "1.2.0-alpha.9",
+    "version": "1.2.0",
     "description": "This library provides easy communication between x-bees and integrated web applications",
     "author": "dimitri.chernykh <dimitri.chernykh@wildix.com>",
     "homepage": "",

package/dist-es/src/Client.js

@@ -1,6 +1,7 @@
 import packageJson from '../package.json';
 import { ClientEventType, DeprecatedUrlParams, EventType, UrlParams } from './enums';
 import LocalStorageManager from './helpers/LocalStorageManager';
+import { MessageListener } from './helpers/MessageListener';
 import PostMessageControllerNative from './helpers/PostMessageControllerNative';
 import PostMessageControllerWeb from './helpers/PostMessageControllerWeb';
 import TechnicalSupport from './helpers/TechnicalSupport';
@@ -70,7 +71,7 @@ export class Client {
     }
     parseMessage(message) {
         try {
-            const data = typeof message.data === 'string' ? JSON.parse(message.data) : message.data;
+            const data = typeof message.data === 'string' ? MessageListener.parseJSON(message.data) : message.data;
             if (!data?.type) {
                 return null;
             }

package/dist-es/src/helpers/MessageListener.js

@@ -0,0 +1,81 @@
+import { EventType } from '../enums';
+export class MessageListener {
+    static instance = null;
+    static getInstance() {
+        if (!this.instance) {
+            this.instance = new MessageListener();
+        }
+        return this.instance;
+    }
+    listeners = [];
+    useSubscription = false;
+    // eslint-disable-next-line
+    constructor() { }
+    parseMessage(message) {
+        try {
+            const data = typeof message.data === 'string' ? MessageListener.parseJSON(message.data) : message.data;
+            if (!data?.type) {
+                return null;
+            }
+            return data;
+        }
+        catch (error) {
+            console.error('parse message error', error);
+            return null;
+        }
+    }
+    static parseJSON(messageData) {
+        const trimmedData = messageData.trim();
+        if (!trimmedData || !trimmedData.startsWith('{') || !trimmedData.endsWith('}')) {
+            return null;
+        }
+        return JSON.parse(trimmedData);
+    }
+    onMessage = (message) => {
+        if (window.location.host === message.origin || window === message.source) {
+            console.debug(`onMessage skipped ${window.location.host} - ${message.origin} - ${window === message.source} - ${message}`);
+            // skip events started from integration itself if any
+            return;
+        }
+        const data = this.parseMessage(message);
+        if (!data) {
+            console.debug('onMessage skipped', message);
+            return;
+        }
+        const { type, payload } = data;
+        console.debug(`onMessage call - ${type} - ${payload}`);
+        this.listeners.forEach(({ eventName, callback }) => {
+            if (eventName === type) {
+                if (type === EventType.ADD_CALL) {
+                    const callbackFn = callback;
+                    callbackFn(payload);
+                }
+                else {
+                    // @ts-expect-error TODO: check the type for Callback<?>
+                    const callbackFn = callback;
+                    callbackFn(payload);
+                }
+            }
+        });
+    };
+    listen(eventName, callback) {
+        if (!this.useSubscription) {
+            this.useSubscription = true;
+            window.addEventListener('message', this.onMessage);
+        }
+        const foundThisEvent = this.listeners.find(({ eventName: _eventName, callback: _callback }) => eventName === _eventName && Object.is(callback, _callback));
+        if (!foundThisEvent) {
+            this.listeners.push({ eventName, callback });
+        }
+        return () => {
+            this.off(eventName, callback);
+        };
+    }
+    off(eventName, callback) {
+        this.listeners = this.listeners.filter(({ eventName: _eventName, callback: _callback }) => !(Object.is(callback, _callback) && (!eventName ? true : eventName === _eventName)));
+        if (this.useSubscription && !this.listeners.length) {
+            this.useSubscription = false;
+            window.removeEventListener('message', this.onMessage);
+        }
+    }
+}

package/dist-types/src/helpers/MessageListener.d.ts

@@ -0,0 +1,14 @@
+import { Callback, RemoveEventListener } from '../../types';
+import { EventType } from '../enums';
+export declare class MessageListener {
+    private static instance;
+    static getInstance(): MessageListener;
+    private listeners;
+    private useSubscription;
+    private constructor();
+    private parseMessage;
+    static parseJSON(messageData: string): any;
+    private onMessage;
+    listen<T extends EventType = EventType>(eventName: T, callback: Callback<T>): RemoveEventListener;
+    off<T extends EventType = EventType>(eventName: T | null, callback: Callback<T>): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wildix/xbees-connect",
-  "version": "1.2.0-alpha.9",
+  "version": "1.2.1",
   "description": "This library provides easy communication between x-bees and integrated web applications",
   "author": "dimitri.chernykh <dimitri.chernykh@wildix.com>",
   "homepage": "",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "a73073032bd9d6fe2986345f8c6b9ae3e08690c1"
+  "gitHead": "a2732739df49717b258c3a6b97a5cce3f333f43a"
 }