11#include " ../app.hh"
22
33using namespace ssc ::runtime;
4+ using namespace ssc ::runtime::app;
5+ using ssc::runtime::window::Window;
6+ using ssc::runtime::config::isDebugEnabled;
47using ssc::runtime::config::getUserConfig;
8+ using ssc::runtime::config::getDevHost;
9+ using ssc::runtime::config::getDevPort;
510using ssc::runtime::string::parseStringList;
611using ssc::runtime::string::split;
12+ using ssc::runtime::string::trim;
713
814static dispatch_queue_attr_t qos = dispatch_queue_attr_make_with_qos_class(
915 DISPATCH_QUEUE_CONCURRENT,
@@ -198,7 +204,7 @@ - (BOOL) application: (UIApplication*) application
198204 argv.push_back (" '" + trim (arg) + " '" );
199205 }
200206
201- auto windowManagerOptions = WindowManagerOptions {};
207+ auto windowManagerOptions = window::ManagerOptions {};
202208
203209 for (const auto & arg : split (self.app ->runtime .userConfig [" ssc_argv" ], ' ,' )) {
204210 if (arg.find (" --test" ) == 0 ) {
@@ -216,37 +222,10 @@ - (BOOL) application: (UIApplication*) application
216222 static const auto port = getDevPort ();
217223 static const auto host = getDevHost ();
218224
219- if (
220- self.app ->runtime .userConfig [" webview_service_worker_mode" ] != " hybrid" &&
221- self.app ->runtime .userConfig [" permissions_allow_service_worker" ] != " false"
222- ) {
223- auto serviceWorkerWindowOptions = Window::Options {};
224- auto serviceWorkerUserConfig = self.app ->runtime .userConfig ;
225-
226- serviceWorkerUserConfig[" webview_watch_reload" ] = " false" ;
227- serviceWorkerWindowOptions.shouldExitApplicationOnClose = false ;
228- serviceWorkerWindowOptions.index = SOCKET_RUNTIME_SERVICE_WORKER_CONTAINER_WINDOW_INDEX;
229- serviceWorkerWindowOptions.headless = Env::get (" SOCKET_RUNTIME_SERVICE_WORKER_DEBUG" ).size () == 0 ;
230- serviceWorkerWindowOptions.userConfig = serviceWorkerUserConfig;
231- serviceWorkerWindowOptions.features .useGlobalCommonJS = false ;
232- serviceWorkerWindowOptions.features .useGlobalNodeJS = false ;
233-
234- auto serviceWorkerWindow = self.app ->runtime .windowManager .createWindow (serviceWorkerWindowOptions);
235- self.app ->serviceWorkerContainer .init (&serviceWorkerWindow->bridge );
236-
237- serviceWorkerWindow->navigate (
238- " socket://" + self.app ->runtime .userConfig [" meta_bundle_identifier" ] + " /socket/service-worker/index.html"
239- );
240- }
241-
242225 auto defaultWindow = self.app ->runtime .windowManager .createDefaultWindow (Window::Options {
243226 .shouldExitApplicationOnClose = true
244227 });
245228
246- if (self.app ->runtime .userConfig [" webview_service_worker_mode" ] == " hybrid" ) {
247- self.app ->serviceWorkerContainer .init (&defaultWindow->bridge );
248- }
249-
250229 defaultWindow->setTitle (self.app ->runtime .userConfig [" meta_title" ]);
251230
252231 if (isDebugEnabled () && port > 0 && host.size () > 0 ) {
0 commit comments