@maxzima/wa-communicator 0.0.9 → 0.0.10

package/README.md

@@ -56,7 +56,7 @@ const communicator = new CommunicatorReceiver({
 });
 
 // subscribe
-communicator.follow('one', {
+communicator.subscribe({
   target: CommunicatorTargetEnum.SIGN_UP,
   action: CommunicatorActionEnum.CLOSE,
   callback: message => {
@@ -65,8 +65,7 @@ communicator.follow('one', {
 });
 
 // unsubscribe
-receiver.unfollow({
-  code: 'one',
+receiver.unsubscribe({
   action: CommunicatorActionEnum.CLOSE
 });
 

package/dist/engine/CommunicatorReceiver.d.ts

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

package/dist/engine/CommunicatorReceiver.js

@@ -1,4 +1,4 @@
-import { modifyOrigin } from "./utils";
+import { isValidMessage, modifyOrigin } from "./utils";
 import { CommunicatorTargetEnum_isCorrect } from '../enums/CommunicatorTargetEnum';
 import { CommunicatorActionEnum_isCorrect } from '../enums/CommunicatorActionEnum';
 export class CommunicatorReceiver {
@@ -8,18 +8,17 @@ export class CommunicatorReceiver {
             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) {
-                return;
-            }
-            if (!this.isValidMessage(message)) {
+            if (!isValidMessage(message)) {
                 return;
             }
             const queue = this.queue.filter(item => item.target === message.target && message.action.hasOwnProperty(item.action));
@@ -31,44 +30,32 @@ export class CommunicatorReceiver {
                 });
             }
         };
-        this.prepareCode = (code) => {
-            if (typeof code === 'string' || code === "") {
-                throw new Error('WAC: code is not valid!');
+        this.subscribe = (params) => {
+            if (params.code && typeof params.code !== 'string') {
+                throw new Error('WAC: code can only be a string!');
             }
-            return `wab_${code}`;
-        };
-        this.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;
-        };
-        this.subscribe = (code, params) => {
             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 => item.code === this.prepareCode(code) && item.target === params.target && item.action === params.action)) {
+            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!`);
             }
-            this.queue.push({
-                code: this.prepareCode(code),
+            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) {
@@ -76,7 +63,7 @@ export class CommunicatorReceiver {
                 return true;
             }
             const queueForRemove = this.queue.filter(item => {
-                return (!params.code || item.code === this.prepareCode(params.code)) &&
+                return (!params.code || item.code === params.code) &&
                     (!params.target || item.target === params.target) &&
                     (!params.action || item.action === params.action);
             });

package/dist/engine/CommunicatorSender.js

@@ -1,5 +1,4 @@
-import { modifyOrigin } from './utils';
-import { CommunicatorTargetEnum_isCorrect } from '../enums/CommunicatorTargetEnum';
+import { isValidMessage, modifyOrigin } from './utils';
 export class CommunicatorSender {
     constructor(props) {
         this.otherWindow = props.otherWindow;
@@ -12,12 +11,8 @@ export class CommunicatorSender {
         if (!this.receiverOrigin) {
             return;
         }
-        if (!CommunicatorTargetEnum_isCorrect(message.target)) {
-            throw new Error(`WAC: Target "${message.target}" is not allowed!`);
-        }
-        if (!this.receiverOrigin ||
-            !CommunicatorTargetEnum_isCorrect(message.target)) {
-            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 @@
+import { TCommunicatorMessage } from "../types";
 export declare function modifyOrigin(address: string): string;
+export declare function isValidMessage(message: TCommunicatorMessage): boolean;

package/dist/engine/utils.js

@@ -1,3 +1,5 @@
+import { CommunicatorTargetEnum_isCorrect } from "../enums/CommunicatorTargetEnum";
+import { CommunicatorActionEnum_isCorrect } from "../enums/CommunicatorActionEnum";
 export function modifyOrigin(address) {
     let url;
     try {
@@ -10,3 +12,19 @@ export function modifyOrigin(address) {
     }
     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

@@ -21,19 +21,21 @@ 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;
+    code?: string;
     target: CommunicatorTargetEnum;
     action: CommunicatorActionEnum;
     params?: {

package/package.json

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

package/src/engine/CommunicatorReceiver.ts

@@ -5,7 +5,7 @@ import {
   TReceiverSubscribeParams,
   TReceiverUnsubscribeMessageParams,
 } from '../types';
-import {modifyOrigin} from "./utils";
+import {isValidMessage, modifyOrigin} from "./utils";
 import {CommunicatorTargetEnum_isCorrect} from '../enums/CommunicatorTargetEnum';
 import {CommunicatorActionEnum_isCorrect} from '../enums/CommunicatorActionEnum';
 
@@ -33,20 +33,19 @@ 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) {
       return;
     }
 
-    if (!this.isValidMessage(message)) {
+    if (!isValidMessage(message)) {
       return;
     }
 
@@ -62,46 +61,15 @@ export class CommunicatorReceiver {
     }
   };
 
-  /**
-   * Prepare code for queue
-   * @param code
-   */
-  private prepareCode = (code: string) => {
-    if (typeof code === 'string' || code === "") {
-      throw new Error('WAC: code is not valid!');
-    }
-    return `wab_${code}`
-  }
-
-  /**
-   * Check the message for validity
-   * @param message
-   */
-  public 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;
-  }
-
   /**
    * Subscribe by target and action
-   * @param code
    * @param params
    */
-  public subscribe = (code: string, params: TReceiverSubscribeParams): void => {
+  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))
@@ -109,18 +77,27 @@ export class CommunicatorReceiver {
       throw new Error('WAC: target or action is not allowed!');
     }
 
-    if (this.queue.find(item => item.code === this.prepareCode(code) && item.target === params.target && item.action === params.action)) {
+    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!`);
     }
 
-    this.queue.push({
-      code: this.prepareCode(code),
+    const newQueueItem = {
       target: params.target,
       action: params.action,
       params: {
         callback: params.callback,
       }
-    });
+    };
+
+    if (params.code) {
+      newQueueItem['code'] = params.code;
+    }
+
+    this.queue.push(newQueueItem);
   }
 
   /**
@@ -134,7 +111,7 @@ export class CommunicatorReceiver {
     }
 
     const queueForRemove = this.queue.filter(item => {
-      return (!params.code || item.code === this.prepareCode(params.code)) &&
+      return (!params.code || item.code === params.code) &&
         (!params.target || item.target === params.target) &&
         (!params.action || item.action === params.action);
     });

package/src/engine/CommunicatorSender.ts

@@ -1,6 +1,5 @@
 import {TCommunicatorMessage, TSenderProps} from '../types';
-import {modifyOrigin} from './utils';
-import {CommunicatorTargetEnum_isCorrect} from '../enums/CommunicatorTargetEnum';
+import {isValidMessage, modifyOrigin} from './utils';
 
 export class CommunicatorSender {
   private readonly otherWindow: Window;
@@ -24,15 +23,8 @@ export class CommunicatorSender {
       return;
     }
 
-    if (!CommunicatorTargetEnum_isCorrect(message.target)) {
-      throw new Error(`WAC: Target "${message.target}" is not allowed!`);
-    }
-
-    if (
-      !this.receiverOrigin ||
-      !CommunicatorTargetEnum_isCorrect(message.target)
-    ) {
-      return;
+    if (!isValidMessage(message)) {
+      throw new Error(`WAC: Message not valid!`);
     }
 
     const jsonMessage = JSON.stringify(message);

package/src/engine/utils.ts

@@ -1,3 +1,11 @@
+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 {
@@ -9,3 +17,26 @@ export function modifyOrigin(address: string): string {
   }
   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

@@ -27,6 +27,7 @@ export type TCommunicatorSenderActionMap = {
   [CommunicatorActionEnum.GOTO]?: TCommunicatorActionGotoParams,
   [CommunicatorActionEnum.CLOSE]?: true,
   [CommunicatorActionEnum.OPEN]?: CommunicatorTargetEnum,
+  [CommunicatorActionEnum.TOKEN]?: string,
 }
 
 export type TCommunicatorMessage = {
@@ -35,6 +36,7 @@ export type TCommunicatorMessage = {
 }
 
 export type TReceiverSubscribeParams = {
+  code?: string;
   target: CommunicatorTargetEnum,
   action: CommunicatorActionEnum,
   callback: TReceiverCallback,
@@ -43,7 +45,7 @@ export type TReceiverSubscribeParams = {
 export type TReceiverMessageQueue = TReceiverMessageQueueItem[]
 
 export type TReceiverMessageQueueItem = {
-  code: string;
+  code?: string;
   target: CommunicatorTargetEnum,
   action: CommunicatorActionEnum,
   params?: {