@maxzima/wa-communicator 0.0.7 → 0.0.10

package/README.md

@@ -52,13 +52,21 @@ communicator.sendMessage({
 
 ```javascript
 const communicator = new CommunicatorReceiver({
-  senderOrigin: 'clients.google.com',
-  callback: (message) => {
-    if (message.target === CommunicatorTargetEnum.SIGN_UP && message.action[CommunicatorActionEnum.GOTO]) {
-      window.location.href = message.action[CommunicatorActionEnum.GOTO].url;
-    }
-  }
+  senderOrigin: 'clients.google.com'
+});
+
+// subscribe
+communicator.subscribe({
+  target: CommunicatorTargetEnum.SIGN_UP,
+  action: CommunicatorActionEnum.CLOSE,
+  callback: message => {
+    console.log('close', message);
+  },
+});
+
+// unsubscribe
+receiver.unsubscribe({
+  action: CommunicatorActionEnum.CLOSE
 });
 
-communicator.watch();
 ```

package/dist/engine/CommunicatorReceiver.d.ts

@@ -1,8 +1,9 @@
-import { TReceiverProps } from '../types';
+import { TReceiverProps, TReceiverSubscribeParams, TReceiverUnsubscribeMessageParams } from '../types';
 export declare class CommunicatorReceiver {
-    private readonly callback;
     private readonly senderOrigin;
+    private queue;
     constructor(props: TReceiverProps);
-    watch(): void;
     private onMessage;
+    subscribe: (params: TReceiverSubscribeParams) => void;
+    unsubscribe: (params?: TReceiverUnsubscribeMessageParams) => boolean;
 }

package/dist/engine/CommunicatorReceiver.js

@@ -1,29 +1,85 @@
+import { isValidMessage, modifyOrigin } from "./utils";
+import { CommunicatorTargetEnum_isCorrect } from '../enums/CommunicatorTargetEnum';
+import { CommunicatorActionEnum_isCorrect } from '../enums/CommunicatorActionEnum';
 export class CommunicatorReceiver {
     constructor(props) {
+        this.queue = [];
         this.onMessage = (event) => {
             if (!event || !event.origin || !event.data) {
                 return;
             }
+            if (this.senderOrigin !== event.origin) {
+                return;
+            }
             let message;
             try {
                 message = JSON.parse(event.data);
             }
             catch (error) {
-                console.log('PostMessage read error');
                 return;
             }
-            if (this.senderOrigin !== event.origin) {
+            if (!isValidMessage(message)) {
                 return;
             }
-            if (typeof this.callback !== 'function') {
-                return;
+            const queue = this.queue.filter(item => item.target === message.target && message.action.hasOwnProperty(item.action));
+            if (queue.length) {
+                queue.forEach(item => {
+                    if (typeof item.params.callback === 'function') {
+                        item.params.callback(message);
+                    }
+                });
             }
-            this.callback(message);
         };
-        this.callback = props.callback;
-        this.senderOrigin = props.senderOrigin;
-    }
-    watch() {
-        window.addEventListener('message', this.onMessage, false);
+        this.subscribe = (params) => {
+            if (params.code && typeof params.code !== 'string') {
+                throw new Error('WAC: code can only be a string!');
+            }
+            if ((!params.target || !CommunicatorTargetEnum_isCorrect(params.target)) ||
+                (!params.action || !CommunicatorActionEnum_isCorrect(params.action))) {
+                throw new Error('WAC: target or action is not allowed!');
+            }
+            if (this.queue.find(item => {
+                return (!params.code || item.code === params.code) &&
+                    item.target === params.target &&
+                    item.action === params.action;
+            })) {
+                console.log(`WAB: subscribe is exists!`);
+            }
+            const newQueueItem = {
+                target: params.target,
+                action: params.action,
+                params: {
+                    callback: params.callback,
+                }
+            };
+            if (params.code) {
+                newQueueItem['code'] = params.code;
+            }
+            this.queue.push(newQueueItem);
+        };
+        this.unsubscribe = (params) => {
+            if (!params) {
+                this.queue = [];
+                return true;
+            }
+            const queueForRemove = this.queue.filter(item => {
+                return (!params.code || item.code === params.code) &&
+                    (!params.target || item.target === params.target) &&
+                    (!params.action || item.action === params.action);
+            });
+            if (queueForRemove.length) {
+                const toRemove = new Set(queueForRemove);
+                this.queue = this.queue.filter(x => !toRemove.has(x));
+                return true;
+            }
+            return false;
+        };
+        this.senderOrigin = modifyOrigin(props.senderOrigin);
+        if (this.senderOrigin) {
+            window.addEventListener('message', this.onMessage, false);
+        }
+        else {
+            throw new Error('WAC: senderOrigin is broken!');
+        }
     }
 }

package/dist/engine/CommunicatorSender.js

@@ -1,15 +1,19 @@
-import { modifyUrl } from './utils';
-import { CommunicatorTargetEnum_isCorrect } from '../enums/CommunicatorTargetEnum';
+import { isValidMessage, modifyOrigin } from './utils';
 export class CommunicatorSender {
     constructor(props) {
         this.otherWindow = props.otherWindow;
-        this.receiverOrigin = modifyUrl(props.receiverOrigin);
+        this.receiverOrigin = modifyOrigin(props.receiverOrigin);
+        if (!this.receiverOrigin) {
+            throw new Error('WAC: receiverOrigin is broken!');
+        }
     }
     sendMessage(message) {
-        if (!this.receiverOrigin ||
-            !CommunicatorTargetEnum_isCorrect(message.target)) {
+        if (!this.receiverOrigin) {
             return;
         }
+        if (!isValidMessage(message)) {
+            throw new Error(`WAC: Message not valid!`);
+        }
         const jsonMessage = JSON.stringify(message);
         this.otherWindow.postMessage(jsonMessage, this.receiverOrigin);
     }

package/dist/engine/utils.d.ts

@@ -1 +1,3 @@
-export declare function modifyUrl(address: string): string;
+import { TCommunicatorMessage } from "../types";
+export declare function modifyOrigin(address: string): string;
+export declare function isValidMessage(message: TCommunicatorMessage): boolean;

package/dist/engine/utils.js

@@ -1,4 +1,6 @@
-export function modifyUrl(address) {
+import { CommunicatorTargetEnum_isCorrect } from "../enums/CommunicatorTargetEnum";
+import { CommunicatorActionEnum_isCorrect } from "../enums/CommunicatorActionEnum";
+export function modifyOrigin(address) {
     let url;
     try {
         let targetOrigin = address.trim();
@@ -8,5 +10,21 @@ export function modifyUrl(address) {
     catch (_) {
         return null;
     }
-    return url.toString();
+    return url.origin;
+}
+export function isValidMessage(message) {
+    const isValidTarget = message.target && CommunicatorTargetEnum_isCorrect(message.target);
+    const actions = message.action;
+    let isValidActions = typeof actions === 'object';
+    if (isValidTarget && isValidActions) {
+        for (const prop in actions) {
+            if (actions.hasOwnProperty(prop)) {
+                isValidActions = actions.hasOwnProperty(prop) && CommunicatorActionEnum_isCorrect(prop);
+                if (!isValidActions) {
+                    break;
+                }
+            }
+        }
+    }
+    return isValidTarget && isValidActions;
 }

package/dist/enums/CommunicatorActionEnum.d.ts

@@ -2,6 +2,7 @@ export declare enum CommunicatorActionEnum {
     CLOSE = "close",
     OPEN = "open",
     GOTO = "goto",
-    RESIZE = "resize"
+    RESIZE = "resize",
+    TOKEN = "token"
 }
 export declare function CommunicatorActionEnum_isCorrect(item: string): boolean;

package/dist/enums/CommunicatorActionEnum.js

@@ -4,6 +4,7 @@ export var CommunicatorActionEnum;
     CommunicatorActionEnum["OPEN"] = "open";
     CommunicatorActionEnum["GOTO"] = "goto";
     CommunicatorActionEnum["RESIZE"] = "resize";
+    CommunicatorActionEnum["TOKEN"] = "token";
 })(CommunicatorActionEnum || (CommunicatorActionEnum = {}));
 export function CommunicatorActionEnum_isCorrect(item) {
     return Object.values(CommunicatorActionEnum).includes(item);

package/dist/receiver.d.ts

@@ -2,4 +2,5 @@ import { CommunicatorReceiver } from "./engine/CommunicatorReceiver";
 import { CommunicatorTargetEnum } from "./enums/CommunicatorTargetEnum";
 import { CommunicatorActionEnum } from "./enums/CommunicatorActionEnum";
 import * as types from "./types";
-export { CommunicatorReceiver, CommunicatorTargetEnum, CommunicatorActionEnum, types, };
+import { isValidMessage as communicatorMessageIsValid } from "./engine/utils";
+export { CommunicatorReceiver, CommunicatorTargetEnum, CommunicatorActionEnum, types, communicatorMessageIsValid };

package/dist/receiver.js

@@ -2,4 +2,5 @@ import { CommunicatorReceiver } from "./engine/CommunicatorReceiver";
 import { CommunicatorTargetEnum } from "./enums/CommunicatorTargetEnum";
 import { CommunicatorActionEnum } from "./enums/CommunicatorActionEnum";
 import * as types from "./types";
-export { CommunicatorReceiver, CommunicatorTargetEnum, CommunicatorActionEnum, types, };
+import { isValidMessage as communicatorMessageIsValid } from "./engine/utils";
+export { CommunicatorReceiver, CommunicatorTargetEnum, CommunicatorActionEnum, types, communicatorMessageIsValid };

package/dist/types/index.d.ts

@@ -5,7 +5,6 @@ export declare type TSenderProps = {
     otherWindow: Window;
 };
 export declare type TReceiverProps = {
-    callback: TReceiverCallback;
     senderOrigin: string;
 };
 export declare type TReceiverCallback = (message: TCommunicatorMessage) => void;
@@ -22,8 +21,29 @@ export declare type TCommunicatorSenderActionMap = {
     [CommunicatorActionEnum.GOTO]?: TCommunicatorActionGotoParams;
     [CommunicatorActionEnum.CLOSE]?: true;
     [CommunicatorActionEnum.OPEN]?: CommunicatorTargetEnum;
+    [CommunicatorActionEnum.TOKEN]?: string;
 };
 export declare type TCommunicatorMessage = {
     target: CommunicatorTargetEnum;
     action: TCommunicatorSenderActionMap;
 };
+export declare type TReceiverSubscribeParams = {
+    code?: string;
+    target: CommunicatorTargetEnum;
+    action: CommunicatorActionEnum;
+    callback: TReceiverCallback;
+};
+export declare type TReceiverMessageQueue = TReceiverMessageQueueItem[];
+export declare type TReceiverMessageQueueItem = {
+    code?: string;
+    target: CommunicatorTargetEnum;
+    action: CommunicatorActionEnum;
+    params?: {
+        callback: TReceiverCallback;
+    };
+};
+export declare type TReceiverUnsubscribeMessageParams = {
+    code?: string;
+    target?: CommunicatorTargetEnum;
+    action?: CommunicatorActionEnum;
+};

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.7",
+  "version": "0.0.10",
   "name": "@maxzima/wa-communicator",
   "description": "",
   "author": "Noname",

package/src/engine/CommunicatorReceiver.ts

@@ -1,19 +1,27 @@
-import {TCommunicatorMessage, TReceiverCallback, TReceiverProps} from '../types';
+import {
+  TCommunicatorMessage,
+  TReceiverMessageQueue,
+  TReceiverProps,
+  TReceiverSubscribeParams,
+  TReceiverUnsubscribeMessageParams,
+} from '../types';
+import {isValidMessage, modifyOrigin} from "./utils";
+import {CommunicatorTargetEnum_isCorrect} from '../enums/CommunicatorTargetEnum';
+import {CommunicatorActionEnum_isCorrect} from '../enums/CommunicatorActionEnum';
 
 export class CommunicatorReceiver {
-  private readonly callback: TReceiverCallback;
   private readonly senderOrigin: string;
+  private queue: TReceiverMessageQueue = [];
 
   constructor(props: TReceiverProps) {
-    this.callback = props.callback;
-    this.senderOrigin = props.senderOrigin;
-  }
+    this.senderOrigin = modifyOrigin(props.senderOrigin);
 
-  /**
-   * Watch Messages
-   */
-  public watch() {
-    window.addEventListener('message', this.onMessage, false);
+    if (this.senderOrigin) {
+      // Watch Messages
+      window.addEventListener('message', this.onMessage, false);
+    } else {
+      throw new Error('WAC: senderOrigin is broken!');
+    }
   }
 
   /**
@@ -25,24 +33,96 @@ export class CommunicatorReceiver {
       return;
     }
 
+    if (this.senderOrigin !== event.origin) {
+      return;
+    }
+
     let message: TCommunicatorMessage;
 
     try {
       message = JSON.parse(event.data);
     } catch (error) {
-      console.log('PostMessage read error');
       return;
     }
 
-    if (this.senderOrigin !== event.origin) {
+    if (!isValidMessage(message)) {
       return;
     }
 
-    if (typeof this.callback !== 'function') {
-      return;
-    }
+    // Find queue by target and action
+    const queue = this.queue.filter(item => item.target === message.target && message.action.hasOwnProperty(item.action));
 
-    this.callback(message);
+    if (queue.length) {
+      queue.forEach(item => {
+        if (typeof item.params.callback === 'function') {
+          item.params.callback(message);
+        }
+      })
+    }
   };
+
+  /**
+   * Subscribe by target and action
+   * @param params
+   */
+  public subscribe = (params: TReceiverSubscribeParams): void => {
+    if (params.code && typeof params.code !== 'string') {
+      throw new Error('WAC: code can only be a string!');
+    }
+
+    if (
+      (!params.target || !CommunicatorTargetEnum_isCorrect(params.target)) ||
+      (!params.action || !CommunicatorActionEnum_isCorrect(params.action))
+    ) {
+      throw new Error('WAC: target or action is not allowed!');
+    }
+
+    if (this.queue.find(item => {
+      return (!params.code || item.code === params.code) &&
+        item.target === params.target &&
+        item.action === params.action;
+    })) {
+      console.log(`WAB: subscribe is exists!`);
+    }
+
+    const newQueueItem = {
+      target: params.target,
+      action: params.action,
+      params: {
+        callback: params.callback,
+      }
+    };
+
+    if (params.code) {
+      newQueueItem['code'] = params.code;
+    }
+
+    this.queue.push(newQueueItem);
+  }
+
+  /**
+   * Subscribe by code or target or action
+   * @param params
+   */
+  public unsubscribe = (params?: TReceiverUnsubscribeMessageParams): boolean => {
+    if (!params) {
+      this.queue = [];
+      return true;
+    }
+
+    const queueForRemove = this.queue.filter(item => {
+      return (!params.code || item.code === params.code) &&
+        (!params.target || item.target === params.target) &&
+        (!params.action || item.action === params.action);
+    });
+
+    if (queueForRemove.length) {
+      const toRemove = new Set(queueForRemove);
+      this.queue = this.queue.filter(x => !toRemove.has(x));
+      return true;
+    }
+
+    return false;
+  }
 }
 

package/src/engine/CommunicatorSender.ts

@@ -1,6 +1,5 @@
 import {TCommunicatorMessage, TSenderProps} from '../types';
-import {modifyUrl} from './utils';
-import {CommunicatorTargetEnum_isCorrect} from '../enums/CommunicatorTargetEnum';
+import {isValidMessage, modifyOrigin} from './utils';
 
 export class CommunicatorSender {
   private readonly otherWindow: Window;
@@ -8,7 +7,11 @@ export class CommunicatorSender {
 
   constructor(props: TSenderProps) {
     this.otherWindow = props.otherWindow;
-    this.receiverOrigin = modifyUrl(props.receiverOrigin);
+    this.receiverOrigin = modifyOrigin(props.receiverOrigin);
+
+    if (!this.receiverOrigin) {
+      throw new Error('WAC: receiverOrigin is broken!');
+    }
   }
 
   /**
@@ -16,13 +19,14 @@ export class CommunicatorSender {
    * @param message
    */
   public sendMessage(message: TCommunicatorMessage) {
-    if (
-      !this.receiverOrigin ||
-      !CommunicatorTargetEnum_isCorrect(message.target)
-    ) {
+    if (!this.receiverOrigin) {
       return;
     }
 
+    if (!isValidMessage(message)) {
+      throw new Error(`WAC: Message not valid!`);
+    }
+
     const jsonMessage = JSON.stringify(message);
     this.otherWindow.postMessage(jsonMessage, this.receiverOrigin);
   }

package/src/engine/utils.ts

@@ -1,4 +1,12 @@
-export function modifyUrl(address: string): string {
+import {TCommunicatorMessage} from "../types";
+import {CommunicatorTargetEnum_isCorrect} from "../enums/CommunicatorTargetEnum";
+import {CommunicatorActionEnum_isCorrect} from "../enums/CommunicatorActionEnum";
+
+/**
+ * 
+ * @param address
+ */
+export function modifyOrigin(address: string): string {
   let url: URL;
   try {
     let targetOrigin = address.trim();
@@ -7,5 +15,28 @@ export function modifyUrl(address: string): string {
   } catch (_) {
     return null;
   }
-  return url.toString();
+  return url.origin;
+}
+
+/**
+ * Check the message for validity
+ * @param message
+ */
+export function isValidMessage(message: TCommunicatorMessage) {
+  const isValidTarget = message.target && CommunicatorTargetEnum_isCorrect(message.target);
+  const actions = message.action;
+  let isValidActions = typeof actions === 'object';
+
+  if (isValidTarget && isValidActions) {
+    for (const prop in actions) {
+      if(actions.hasOwnProperty(prop)) {
+        isValidActions = actions.hasOwnProperty(prop) && CommunicatorActionEnum_isCorrect(prop);
+        if (!isValidActions) {
+          break;
+        }
+      }
+    }
+  }
+
+  return isValidTarget && isValidActions;
 }

package/src/enums/CommunicatorActionEnum.ts

@@ -3,6 +3,7 @@ export enum CommunicatorActionEnum {
   OPEN = 'open',
   GOTO = 'goto',
   RESIZE = 'resize',
+  TOKEN = 'token',
 }
 
 export function CommunicatorActionEnum_isCorrect(item: string): boolean {

package/src/receiver.ts

@@ -2,10 +2,12 @@ import {CommunicatorReceiver} from "./engine/CommunicatorReceiver"
 import {CommunicatorTargetEnum} from "./enums/CommunicatorTargetEnum"
 import {CommunicatorActionEnum} from "./enums/CommunicatorActionEnum"
 import * as types from "./types";
+import {isValidMessage as communicatorMessageIsValid} from "./engine/utils";
 
 export {
   CommunicatorReceiver,
   CommunicatorTargetEnum,
   CommunicatorActionEnum,
   types,
+  communicatorMessageIsValid
 }

package/src/types/index.ts

@@ -7,7 +7,6 @@ export type TSenderProps = {
 }
 
 export type TReceiverProps = {
-  callback: TReceiverCallback,
   senderOrigin: string,
 }
 
@@ -28,9 +27,34 @@ export type TCommunicatorSenderActionMap = {
   [CommunicatorActionEnum.GOTO]?: TCommunicatorActionGotoParams,
   [CommunicatorActionEnum.CLOSE]?: true,
   [CommunicatorActionEnum.OPEN]?: CommunicatorTargetEnum,
+  [CommunicatorActionEnum.TOKEN]?: string,
 }
 
 export type TCommunicatorMessage = {
   target: CommunicatorTargetEnum,
   action: TCommunicatorSenderActionMap
 }
+
+export type TReceiverSubscribeParams = {
+  code?: string;
+  target: CommunicatorTargetEnum,
+  action: CommunicatorActionEnum,
+  callback: TReceiverCallback,
+}
+
+export type TReceiverMessageQueue = TReceiverMessageQueueItem[]
+
+export type TReceiverMessageQueueItem = {
+  code?: string;
+  target: CommunicatorTargetEnum,
+  action: CommunicatorActionEnum,
+  params?: {
+    callback: TReceiverCallback,
+  }
+}
+
+export type TReceiverUnsubscribeMessageParams = {
+  code?: string;
+  target?: CommunicatorTargetEnum,
+  action?: CommunicatorActionEnum,
+}

package/tsconfig.json

@@ -16,7 +16,7 @@
     "outDir": "dist",
     "alwaysStrict": true,
     "removeComments": true,
-    "noImplicitReturns": true,
+    "noImplicitReturns": false,
     "noEmit": false,
     "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,