@@ -14,21 +14,26 @@ import { APPLICATION_NAME } from './env.ts';
1414import { ERRORS_IGNORED } from './const.ts' ;
1515import { ETimerType } from '../wrapper/TimerWrapper.ts' ;
1616import type { TTelemetry } from '../wrapper/Wrapper.ts' ;
17- import type { TConfig } from './storage.local.ts' ;
17+ import type { TConfig } from './storage/storage .local.ts' ;
1818import type { TMediaCommand } from '../wrapper/MediaWrapper.ts' ;
1919import type { Delta } from 'jsondiffpatch' ;
20- import type { TSession } from './storage.session.ts' ;
20+ import type { TSession } from './storage/storage .session.ts' ;
2121
2222let port : chrome . runtime . Port | null = null ;
2323export function portPost ( payload : TMsgOptions ) {
24+ if ( ! chrome . runtime ) {
25+ windowPost ( payload ) ;
26+ return ;
27+ }
28+
2429 if ( ! port ) {
2530 port = chrome . tabs . connect ( chrome . devtools . inspectedWindow . tabId , {
2631 name : APPLICATION_NAME ,
2732 } ) ;
28- port . onDisconnect . addListener ( ( ) => void ( port = null ) ) ;
33+ port ? .onDisconnect . addListener ( ( ) => void ( port = null ) ) ;
2934 }
3035
31- port . postMessage ( payload ) ;
36+ port ? .postMessage ( payload ) ;
3237}
3338
3439export function portListen ( callback : ( payload : TMsgOptions ) => void ) {
@@ -67,16 +72,20 @@ export function runtimePost(payload: TMsgOptions) {
6772}
6873
6974export function runtimeListen ( callback : ( payload : TMsgOptions ) => void ) {
70- chrome . runtime . onMessage . addListener (
71- ( payload , sender : chrome . runtime . MessageSender , sendResponse ) => {
72- if (
73- sender . tab ?. id === chrome . devtools . inspectedWindow . tabId
74- ) {
75- callback ( payload ) ;
76- sendResponse ( ) ;
77- }
78- } ,
79- ) ;
75+ if ( chrome ?. runtime ) {
76+ chrome . runtime . onMessage . addListener (
77+ ( payload , sender : chrome . runtime . MessageSender , sendResponse ) => {
78+ if (
79+ sender . tab ?. id === chrome . devtools . inspectedWindow . tabId
80+ ) {
81+ callback ( payload ) ;
82+ sendResponse ( ) ;
83+ }
84+ } ,
85+ ) ;
86+ } else {
87+ windowListen ( callback ) ;
88+ }
8089}
8190
8291function handleRuntimeMessageResponse ( ) : void {
0 commit comments