Install debug package and add debug messages to AppBridge

This commit is contained in:
Lukasz Ostrowski 2022-08-26 09:24:56 +02:00
parent a627e876ad
commit 6de0675784
3 changed files with 73 additions and 13 deletions

View file

@ -17,17 +17,21 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"debug": "^4.3.4",
"fast-glob": "^3.2.11", "fast-glob": "^3.2.11",
"graphql": "^16.5.0", "graphql": "^16.5.0",
"jose": "^4.8.3", "jose": "^4.8.3",
"retes": "^0.32.0", "retes": "^0.32.0",
"uuid": "^8.3.2", "uuid": "^8.3.2"
"debug": "^4.3.4"
}, },
"devDependencies": { "devDependencies": {
"@testing-library/dom": "^8.17.1",
"@types/debug": "^4.1.7",
"@types/node": "^18.6.5", "@types/node": "^18.6.5",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.33.0", "@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0", "@typescript-eslint/parser": "^5.33.0",
"@vitejs/plugin-react": "^2.0.0",
"clean-publish": "^4.0.1", "clean-publish": "^4.0.1",
"eslint": "8.21.0", "eslint": "8.21.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
@ -39,18 +43,15 @@
"eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-simple-import-sort": "^7.0.0",
"husky": "^8.0.1", "husky": "^8.0.1",
"jsdom": "^20.0.0",
"np": "^7.6.1",
"prettier": "2.7.1", "prettier": "2.7.1",
"tsm": "^2.2.2", "tsm": "^2.2.2",
"tsup": "^6.2.1", "tsup": "^6.2.1",
"typescript": "^4.7.4", "typescript": "^4.7.4",
"vite": "^3.0.5",
"vitest": "^0.21.1", "vitest": "^0.21.1",
"watchlist": "^0.3.1", "watchlist": "^0.3.1"
"np": "^7.6.1",
"@types/uuid": "^8.3.4",
"@testing-library/dom": "^8.17.1",
"@vitejs/plugin-react": "^2.0.0",
"jsdom": "^20.0.0",
"vite": "^3.0.5"
}, },
"lint-staged": { "lint-staged": {
"*.{js,ts,tsx}": "eslint --cache --fix", "*.{js,ts,tsx}": "eslint --cache --fix",

View file

@ -2,6 +2,7 @@ lockfileVersion: 5.4
specifiers: specifiers:
'@testing-library/dom': ^8.17.1 '@testing-library/dom': ^8.17.1
'@types/debug': ^4.1.7
'@types/node': ^18.6.5 '@types/node': ^18.6.5
'@types/uuid': ^8.3.4 '@types/uuid': ^8.3.4
'@typescript-eslint/eslint-plugin': ^5.33.0 '@typescript-eslint/eslint-plugin': ^5.33.0
@ -44,6 +45,7 @@ dependencies:
devDependencies: devDependencies:
'@testing-library/dom': 8.17.1 '@testing-library/dom': 8.17.1
'@types/debug': 4.1.7
'@types/node': 18.7.1 '@types/node': 18.7.1
'@types/uuid': 8.3.4 '@types/uuid': 8.3.4
'@typescript-eslint/eslint-plugin': 5.33.0_njno5y7ry2l2lcmiu4tywxkwnq '@typescript-eslint/eslint-plugin': 5.33.0_njno5y7ry2l2lcmiu4tywxkwnq
@ -547,6 +549,12 @@ packages:
resolution: {integrity: sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==} resolution: {integrity: sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==}
dev: true dev: true
/@types/debug/4.1.7:
resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
dependencies:
'@types/ms': 0.7.31
dev: true
/@types/http-cache-semantics/4.0.1: /@types/http-cache-semantics/4.0.1:
resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==} resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==}
dev: true dev: true
@ -573,6 +581,10 @@ packages:
resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
dev: true dev: true
/@types/ms/0.7.31:
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
dev: true
/@types/node/18.7.1: /@types/node/18.7.1:
resolution: {integrity: sha512-GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ==} resolution: {integrity: sha512-GKX1Qnqxo4S+Z/+Z8KKPLpH282LD7jLHWJcVryOflnsnH+BtSDfieR6ObwBMwpnNws0bUK8GI7z0unQf9bARNQ==}
dev: true dev: true

View file

@ -1,3 +1,5 @@
import { debug as createDebug } from "debug";
import { Actions } from "./actions"; import { Actions } from "./actions";
import { AppBridgeState, AppBridgeStateContainer } from "./app-bridge-state"; import { AppBridgeState, AppBridgeStateContainer } from "./app-bridge-state";
import { SSR } from "./constants"; import { SSR } from "./constants";
@ -10,7 +12,11 @@ type SubscribeMap = {
[type in EventType]: Record<symbol, EventCallback<PayloadOfEvent<type>>>; [type in EventType]: Record<symbol, EventCallback<PayloadOfEvent<type>>>;
}; };
const debug = createDebug("AppBridge");
function eventStateReducer(state: AppBridgeState, event: Events) { function eventStateReducer(state: AppBridgeState, event: Events) {
debug("Event reducer received event: %j", event);
switch (event.type) { switch (event.type) {
case EventType.handshake: { case EventType.handshake: {
return { return {
@ -69,6 +75,8 @@ export class AppBridge {
private combinedOptions = getDefaultOptions(); private combinedOptions = getDefaultOptions();
constructor(options: AppBridgeOptions = {}) { constructor(options: AppBridgeOptions = {}) {
debug("Constructor called with options: %j", options);
if (SSR) { if (SSR) {
throw new Error( throw new Error(
"AppBridge detected you're running this app in SSR mode. Make sure to call `new AppBridge()` when window object exists." "AppBridge detected you're running this app in SSR mode. Make sure to call `new AppBridge()` when window object exists."
@ -80,6 +88,8 @@ export class AppBridge {
...options, ...options,
}; };
debug("Resolved combined AppBridge options: %j", this.combinedOptions);
if (!this.refererOrigin) { if (!this.refererOrigin) {
// TODO probably throw // TODO probably throw
console.warn("document.referrer is empty"); console.warn("document.referrer is empty");
@ -100,11 +110,15 @@ export class AppBridge {
eventType: TEventType, eventType: TEventType,
cb: EventCallback<TPayload> cb: EventCallback<TPayload>
) { ) {
debug("subscribe() called with event %s and callback %s", eventType, cb.name);
const key = Symbol("Callback token"); const key = Symbol("Callback token");
// @ts-ignore fixme // @ts-ignore fixme
this.subscribeMap[eventType][key] = cb; this.subscribeMap[eventType][key] = cb;
return () => { return () => {
debug("unsubscribe called with event %s and callback %s", eventType, cb.name);
delete this.subscribeMap[eventType][key]; delete this.subscribeMap[eventType][key];
}; };
} }
@ -117,8 +131,12 @@ export class AppBridge {
*/ */
unsubscribeAll(eventType?: EventType) { unsubscribeAll(eventType?: EventType) {
if (eventType) { if (eventType) {
debug("unsubscribeAll called with event: %s", eventType);
this.subscribeMap[eventType] = {}; this.subscribeMap[eventType] = {};
} else { } else {
debug("unsubscribeAll called without argument");
this.subscribeMap = createEmptySubscribeMap(); this.subscribeMap = createEmptySubscribeMap();
} }
} }
@ -127,10 +145,16 @@ export class AppBridge {
* Dispatch event to dashboard * Dispatch event to dashboard
*/ */
async dispatch<T extends Actions>(action: T) { async dispatch<T extends Actions>(action: T) {
debug("dispatch called with action argument: %j", action);
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
if (!window.parent) { if (!window.parent) {
debug("window.parent doesnt exist, will throw");
reject(new Error("Parent window does not exist.")); reject(new Error("Parent window does not exist."));
} else { } else {
debug("Calling window.parent.postMessage with %j", action);
window.parent.postMessage( window.parent.postMessage(
{ {
type: action.type, type: action.type,
@ -142,7 +166,15 @@ export class AppBridge {
let intervalId: number; let intervalId: number;
const unsubscribe = this.subscribe(EventType.response, ({ actionId, ok }) => { const unsubscribe = this.subscribe(EventType.response, ({ actionId, ok }) => {
debug(
"Subscribing to %s with action id: %s and status 'ok' is: %s",
EventType.response,
actionId,
ok
);
if (action.payload.actionId === actionId) { if (action.payload.actionId === actionId) {
debug("Received matching action id: %s. Will unsubscribe", actionId);
unsubscribe(); unsubscribe();
clearInterval(intervalId); clearInterval(intervalId);
@ -170,28 +202,42 @@ export class AppBridge {
* Gets current state * Gets current state
*/ */
getState() { getState() {
debug("getState() called and will return %j", this.state.getState());
return this.state.getState(); return this.state.getState();
} }
private setInitialState() { private setInitialState() {
debug("setInitialState() called");
const url = new URL(window.location.href); const url = new URL(window.location.href);
const id = url.searchParams.get("id") || ""; const id = url.searchParams.get("id") || "";
const path = window.location.pathname || ""; const path = window.location.pathname || "";
const theme: ThemeType = url.searchParams.get("theme") === "light" ? "light" : "dark"; const theme: ThemeType = url.searchParams.get("theme") === "light" ? "light" : "dark";
this.state.setState({ domain: this.combinedOptions.targetDomain, id, path, theme }); const state = { domain: this.combinedOptions.targetDomain, id, path, theme };
debug("setInitialState() will setState with %j", state);
this.state.setState(state);
} }
private listenOnMessages() { private listenOnMessages() {
debug("listenOnMessages() called");
window.addEventListener( window.addEventListener(
"message", "message",
({ origin, data }: Omit<MessageEvent, "data"> & { data: Events }) => { ({ origin, data }: Omit<MessageEvent, "data"> & { data: Events }) => {
debug("Received message from origin: %s and data: %j", origin, data);
if (origin !== this.refererOrigin) { if (origin !== this.refererOrigin) {
debug("Origin from message doesnt match refererOrigin. Function will return now");
// TODO what should happen here - be explicit // TODO what should happen here - be explicit
return; return;
} }
const newState = eventStateReducer(this.state.getState(), data); const newState = eventStateReducer(this.state.getState(), data);
debug("Computed new state: %j. Will be set with setState", newState);
this.state.setState(newState); this.state.setState(newState);
/** /**
@ -200,10 +246,11 @@ export class AppBridge {
const { type, payload } = data; const { type, payload } = data;
if (EventType[type]) { if (EventType[type]) {
Object.getOwnPropertySymbols(this.subscribeMap[type]).forEach((key) => Object.getOwnPropertySymbols(this.subscribeMap[type]).forEach((key) => {
// @ts-ignore fixme // @ts-ignore fixme
this.subscribeMap[type][key](payload) this.subscribeMap[type][key](payload);
); debug("Setting listener for event: %s and payload %j", type, payload);
});
} }
} }
); );