@@ -2,7 +2,7 @@ import { forwardMessage, Server } from "@Packages/message/server";
22import type { MessageSend } from "@Packages/message/types" ;
33import { ScriptService } from "./script" ;
44import { type Logger } from "@App/app/repo/logger" ;
5- import { ServiceWorkerClientMessage , WindowMessage } from "@Packages/message/window_message" ;
5+ import { WindowMessage } from "@Packages/message/window_message" ;
66import { sendMessage } from "@Packages/message/client" ;
77import GMApi from "./gm_api" ;
88import { MessageQueue } from "@Packages/message/message_queue" ;
@@ -17,13 +17,9 @@ export class OffscreenManager {
1717
1818 private messageQueue = new MessageQueue ( ) ;
1919
20- // 通过postMessage与SW通信,支持结构化克隆(Blob等)
21- private swPostMessage : ServiceWorkerClientMessage ;
22-
23- constructor ( private extMsgSender : MessageSend ) {
20+ constructor ( private msgSender : MessageSend ) {
2421 this . windowMessage = new WindowMessage ( window , sandbox , true ) ;
2522 this . windowServer = new Server ( "offscreen" , this . windowMessage ) ;
26- this . swPostMessage = new ServiceWorkerClientMessage ( ) ;
2723 }
2824
2925 logger ( data : Logger ) {
@@ -36,11 +32,11 @@ export class OffscreenManager {
3632
3733 preparationSandbox ( ) {
3834 // 通知初始化好环境了
39- sendMessage ( this . swPostMessage , "serviceWorker/preparationOffscreen" ) ;
35+ sendMessage ( this . msgSender , "serviceWorker/preparationOffscreen" ) ;
4036 }
4137
4238 sendMessageToServiceWorker ( data : { action : string ; data : any } ) {
43- return sendMessage ( this . extMsgSender , `serviceWorker/${ data . action } ` , data . data ) ;
39+ return sendMessage ( this . msgSender , `serviceWorker/${ data . action } ` , data . data ) ;
4440 }
4541
4642 async initManager ( ) {
@@ -50,20 +46,20 @@ export class OffscreenManager {
5046 this . windowServer . on ( "sendMessageToServiceWorker" , this . sendMessageToServiceWorker . bind ( this ) ) ;
5147 const script = new ScriptService (
5248 this . windowServer . group ( "script" ) ,
53- this . extMsgSender ,
49+ this . msgSender ,
5450 this . windowMessage ,
5551 this . messageQueue
5652 ) ;
5753 script . init ( ) ;
5854 // 转发从sandbox来的gm api请求,通过postMessage通道传输(支持Blob等结构化克隆)
59- forwardMessage ( "serviceWorker" , "runtime/gmApi" , this . windowServer , this . swPostMessage ) ;
55+ forwardMessage ( "serviceWorker" , "runtime/gmApi" , this . windowServer , this . msgSender ) ;
6056 // 转发valueUpdate与emitEvent
6157 forwardMessage ( "sandbox" , "runtime/valueUpdate" , this . windowServer , this . windowMessage ) ;
6258 forwardMessage ( "sandbox" , "runtime/emitEvent" , this . windowServer , this . windowMessage ) ;
6359
6460 const gmApi = new GMApi ( this . windowServer . group ( "gmApi" ) ) ;
6561 gmApi . init ( ) ;
66- const vscodeConnect = new VSCodeConnect ( this . windowServer . group ( "vscodeConnect" ) , this . extMsgSender ) ;
62+ const vscodeConnect = new VSCodeConnect ( this . windowServer . group ( "vscodeConnect" ) , this . msgSender ) ;
6763 vscodeConnect . init ( ) ;
6864
6965 this . windowServer . on ( "createObjectURL" , async ( params : { blob : Blob ; persistence : boolean } ) => {
0 commit comments