$mol_service_plugin namespace

notify/notify.ts

@@ -14,11 +14,11 @@ namespace $ {
 		}
 
 		static show( info: $mol_notify_info ) {
-			this.$.$mol_service.send(info)
+			this.$.$mol_service_host.send(info)
 		}
 
 	}
 
-	$mol_service.attach($mol_notify_service)
+	$mol_service.$mol_notify_service
 
 }

notify/notify.web.ts

@@ -28,5 +28,4 @@ namespace $ {
 	}
 
 	$.$mol_notify = $mol_notify_web
-
 }

notify/service/service.ts

@@ -1,4 +1,4 @@
-namespace $ {
+namespace $.$mol_service {
 	export class $mol_notify_service extends $mol_service_plugin {
 		static override message_data(data: {}) {
 			if ('uri' in data && 'message' in data) {

notify/service/service.web.ts

@@ -1,7 +1,7 @@
-namespace $ {
+namespace $.$mol_service {
 	export class $mol_notify_service_web extends $mol_notify_service {
 		static override init() {
-			const worker = this.$.$mol_service_web.worker()
+			const worker = this.$.$mol_service_host_web.worker()
 			worker.addEventListener( 'notificationclick', this.notification_click_event.bind(this))
 		}
 
@@ -10,7 +10,7 @@ namespace $ {
 		}
 
 		static override async info({ context: title, message: body, uri: data }: $mol_notify_info) {
-			const worker = this.$.$mol_service_web.worker()
+			const worker = this.$.$mol_service_host_web.worker()
 			const tag = data
 			const existen = await worker.registration.getNotifications({ tag })
 
@@ -29,7 +29,7 @@ namespace $ {
 		}
 
 		static async notification_click( notification: Notification ) {
-			const worker = this.$.$mol_service_web.worker()
+			const worker = this.$.$mol_service_host_web.worker()
 
 			const clients = await worker.clients.matchAll({ includeUncontrolled: true, type: 'window' })
 			const last = clients.at(-1)
@@ -45,5 +45,5 @@ namespace $ {
 		}
 	}
 
-	$.$mol_notify_service = $mol_notify_service_web
+	$.$mol_service.$mol_notify_service = $mol_notify_service_web
 }

offline/install/install.ts

@@ -1,4 +1,3 @@
 namespace $ {
-	// Not needed, just refer to $mol_offline anywhere
-	// $mol_service.attach($mol_offline)
+	$.$mol_service.$mol_offline
 }

offline/offline.ts

@@ -1,4 +1,4 @@
-namespace $ {
+namespace $.$mol_service {
 
 	export class $mol_offline extends $mol_service_plugin {
 		static blocked_urls =  [
@@ -64,6 +64,4 @@ namespace $ {
 			return clone
 		}
 	}
-
-	$mol_service.attach($mol_offline)
 }

service/host/host.ts

@@ -0,0 +1,23 @@
+namespace $ {
+	export class $mol_service_host extends $mol_object {
+		static in_worker() { return typeof window === 'undefined' }
+
+		static path() { return 'web.js' }
+
+		@ $mol_action
+		static send(data: {}) {}
+
+		static init() {}
+
+		static blocked_response() {
+			return new Response(
+				null,
+				{
+					status: 418,
+					statusText: 'Blocked'
+				},
+			)
+		}
+	}
+
+}

service/service.web.ts → service/host/host.web.ts

@@ -4,7 +4,7 @@ namespace $ {
 	export type $mol_service_reg_active = ServiceWorkerRegistration & { active: ServiceWorker }
 	export type $mol_service_reg_installing = ServiceWorkerRegistration & { installing: ServiceWorker }
 
-	export class $mol_service_web extends $mol_service {
+	export class $mol_service_host_web extends $mol_service_host {
 		static is_supported() {
 			if( location.protocol !== 'https:' && location.hostname !== 'localhost' ) {
 				console.warn( 'HTTPS or localhost is required for service workers.' )
@@ -32,15 +32,13 @@ namespace $ {
 
 		static override init() {
 			if (this.inited) return
+			this.inited = true
 
 			if ( this.in_worker() ) {
-				this.worker()
-				return
+				this.worker_init()
+			} else if ( this.is_supported() ) {
+				this.registration_init()
 			}
-
-			if ( ! this.is_supported() ) return
-			this.registration_init()
-			this.inited = true
 		}
 
 		static async registration_init() {
@@ -76,25 +74,30 @@ namespace $ {
 			worker.addEventListener( 'statechange', this.state_change.bind(this, worker))
 		}
 
+		static plugins = [] as (typeof $mol_service.$mol_service_plugin)[]
+
 		static state_change(worker: ServiceWorker) {
 			for (const plugin of this.plugins) {
 				plugin.state_change()
 			}
 		}
 
-		static worker() {
-			const worker = self as unknown as ServiceWorkerGlobalScope
-			if (! this.inited) {
-				worker.addEventListener( 'beforeinstallprompt' , this.before_install.bind(this) )
-				worker.addEventListener( 'install' , this.install.bind(this))
-				worker.addEventListener( 'activate' , this.activate.bind(this))
-				worker.addEventListener( 'message', this.message.bind(this))
-				worker.addEventListener('fetch', this.fetch_event.bind(this))
-				this.inited = true
-				for (const plugin of this.plugins) plugin.init()
-			}
+		static async worker_init() {
+			await Promise.resolve()
+			const worker = this.worker()
+			worker.addEventListener( 'beforeinstallprompt' , this.before_install.bind(this) )
+			worker.addEventListener( 'install' , this.install.bind(this))
+			worker.addEventListener( 'activate' , this.activate.bind(this))
+			worker.addEventListener( 'message', this.message.bind(this))
+			worker.addEventListener('fetch', this.fetch_event.bind(this))
+
+			this.plugins = Object.values(this.$.$mol_service).filter(plug => plug !== $mol_service.$mol_service_plugin)
 
-			return worker
+			for (const plugin of this.plugins) plugin.init()
+		}
+
+		static worker() {
+			return self as unknown as ServiceWorkerGlobalScope
 		}
 
 		protected static send_delayed = [] as {}[]
@@ -169,8 +172,8 @@ namespace $ {
 		}
 	}
 
-	$.$mol_service = $mol_service_web
+	$.$mol_service_host = $mol_service_host_web
 
-	$mol_service_web.init()
+	$mol_service_host_web.init()
 
 }

service/service.ts

@@ -1,34 +1,13 @@
-namespace $ {
-
-	export class $mol_service extends $mol_object {
-		static in_worker() { return typeof window === 'undefined' }
-
-		static path() { return 'web.js' }
-
-		@ $mol_action
-		static send(data: {}) {}
-
-		protected static plugins = new Set<typeof $mol_service_plugin>()
-
-		static attach(plugin: typeof $mol_service_plugin) {
-			this.plugins.add(plugin)
-		}
-
-		static detach(plugin: typeof $mol_service_plugin) {
-			this.plugins.delete(plugin)
-		}
-
+namespace $.$mol_service {
+	export class $mol_service_plugin extends $mol_object {
 		static init() {}
-
-		static blocked_response() {
-			return new Response(
-				null,
-				{
-					status: 418,
-					statusText: 'Blocked'
-				},
-			)
-		}
+		static before_install() {}
+		static install() { return null as undefined | null | Promise<unknown> }
+		static activate() { return null as undefined | null | Promise<unknown> }
+		static state_change() {}
+		static message_data(data: {}) { return null as null | undefined | Promise<unknown> }
+
+		static blocked(res: Request) { return false }
+		static modify(res: Request) { return null as null | Response | PromiseLike<Response> }
 	}
-
 }