From 7028ff404988b449069d19f766799834a4f1b296 Mon Sep 17 00:00:00 2001 From: 4gray Date: Mon, 13 Oct 2025 00:24:54 +0200 Subject: [PATCH] refactor(nx): app restructuring --- .devcontainer/Dockerfile | 16 - .devcontainer/devcontainer.json | 42 - .gitignore | 97 +- .prettierignore | 11 +- .../src/app/api/main.preload.ts | 3 + .../src/app/events/playlist.events.ts | 58 +- apps/web/eslint.config.mjs | 57 +- apps/web/project.json | 1 + apps/web/src/app/app-routing.module.ts | 12 +- apps/web/src/app/app.component.html | 10 +- apps/web/src/app/app.component.spec.ts | 10 +- apps/web/src/app/app.component.ts | 70 +- apps/web/src/app/app.module.ts | 13 +- .../home/file-upload/file-upload.component.ts | 48 +- apps/web/src/app/home/home.component.spec.ts | 4 +- apps/web/src/app/home/home.component.ts | 9 +- .../playlist-info.component.html | 124 -- .../stalker-portal-import.component.ts | 4 +- .../url-upload/url-upload.component.spec.ts | 2 +- .../home/url-upload/url-upload.component.ts | 2 +- .../xtream-code-import.component.ts | 4 +- apps/web/src/app/services/player.service.ts | 9 +- apps/web/src/app/services/pwa.service.ts | 10 +- .../app/services/settings-store.service.ts | 13 +- .../src/app/services/settings.service.spec.ts | 4 +- apps/web/src/app/services/settings.service.ts | 4 +- apps/web/src/app/services/tauri.service.ts | 107 +- .../app/services/whats-new.service.spec.ts | 38 - .../app/services/whats-new.service.stub.ts | 6 - .../web/src/app/services/whats-new.service.ts | 315 ---- .../src/app/settings/settings.component.html | 648 +++---- .../src/app/settings/settings.component.scss | 4 + .../app/settings/settings.component.spec.ts | 17 +- .../src/app/settings/settings.component.ts | 61 +- .../add-playlist-dialog.component.ts | 25 +- .../components/header/header.component.html | 30 +- .../components/header/header.component.ts | 80 +- .../favorites-button.component.ts | 10 +- .../recently-viewed.component.ts | 7 +- .../stalker-favorites.component.ts | 7 +- .../stalker-main-container.component.ts | 12 +- .../stalker-search.component.ts | 6 +- .../stalker-shell/stalker-shell.component.ts | 4 +- apps/web/src/app/stalker/stalker.store.ts | 14 +- .../account-info/account-info.component.ts | 5 +- .../favorites/favorites.component.ts | 2 +- .../live-stream-layout.component.ts | 3 +- .../navigation/navigation.component.ts | 7 +- .../player-dialog/player-dialog.component.ts | 2 +- .../playlist-error-view.component.ts | 14 +- .../portal-channels-list.component.ts | 4 +- .../search-results.component.ts | 4 +- .../services/favorites.service.ts | 2 +- .../xtream-tauri/with-favorites.feature.ts | 2 +- .../src/app/xtream-tauri/with-recent-items.ts | 2 +- .../xtream-shell/xtream-shell.component.ts | 2 +- apps/web/src/app/xtream-tauri/xtream-state.ts | 6 +- apps/web/src/app/xtream-tauri/xtream.store.ts | 14 +- .../category-content-view.component.html | 1 + .../category-content-view.component.ts | 7 +- .../category-view/category-view.component.ts | 18 +- .../navigation-bar.component.ts | 29 +- .../player-dialog/player-dialog.component.ts | 22 +- .../playlist-error-view.component.ts | 13 +- .../serial-details.component.ts | 15 +- .../vod-details/vod-details.component.ts | 2 +- .../xtream/xtream-main-container.component.ts | 1025 +++++----- .../updates/0110/import-playlist-as-text.png | Bin 31674 -> 0 bytes .../assets/updates/0110/multi-epg-view.png | Bin 147113 -> 0 bytes .../updates/0110/multiple-epg-sources.png | Bin 20051 -> 0 bytes .../src/assets/updates/0130/mpv-player.png | Bin 80432 -> 0 bytes .../src/assets/updates/060/channel-logos.png | Bin 25130 -> 0 bytes .../assets/updates/060/custom-user-agent.png | Bin 14522 -> 0 bytes .../web/src/assets/updates/060/dark-theme.png | Bin 20856 -> 0 bytes .../src/assets/updates/070/auto-refresh.png | Bin 40115 -> 0 bytes .../assets/updates/070/refresh-playlist.png | Bin 51914 -> 0 bytes .../src/assets/updates/080/channel-info.png | Bin 65196 -> 0 bytes .../src/assets/updates/080/translations.png | Bin 11086 -> 0 bytes apps/web/src/assets/updates/090/languages.png | Bin 19947 -> 0 bytes .../assets/updates/090/reorder-playlists.gif | Bin 105423 -> 0 bytes .../assets/updates/090/subtitle-option.png | Bin 19591 -> 0 bytes apps/web/src/global.d.ts | 5 + apps/web/src/index.html | 4 +- .../shared/xtream-live-stream.interface.ts | 2 +- .../src/shared/xtream-vod-stream.interface.ts | 2 +- apps/web/tsconfig.spec.json | 33 +- eslint.config.mjs | 5 +- libs/m3u-state/README.md | 7 + libs/m3u-state/eslint.config.mjs | 34 + libs/m3u-state/jest.config.ts | 21 + libs/m3u-state/project.json | 21 + libs/m3u-state/src/index.ts | 5 + .../m3u-state/src/lib}/actions.ts | 4 +- .../m3u-state/src/lib}/effects.ts | 58 +- .../m3u-state/src/lib}/playlists.state.ts | 2 +- .../m3u-state/src/lib}/reducers.ts | 36 +- .../m3u-state/src/lib}/router.selectors.ts | 0 .../m3u-state/src/lib}/selectors.ts | 38 +- .../state => libs/m3u-state/src/lib}/state.ts | 2 +- libs/m3u-state/src/test-setup.ts | 6 + libs/m3u-state/tsconfig.json | 30 + libs/m3u-state/tsconfig.lib.json | 17 + libs/m3u-state/tsconfig.spec.json | 17 + libs/services/README.md | 11 + libs/services/eslint.config.mjs | 21 + libs/services/jest.config.ts | 13 + libs/services/package.json | 11 + libs/services/project.json | 26 + libs/services/src/index.ts | 7 + .../services/src/lib}/data.service.ts | 6 +- .../services/src/lib}/database.service.ts | 2 +- .../services/src/lib}/dialog.service.spec.ts | 7 +- .../services/src/lib}/dialog.service.ts | 8 +- .../services/src/lib}/epg.service.spec.ts | 3 +- .../services/src/lib}/epg.service.ts | 26 +- .../services/src/lib}/playlists.service.ts | 119 +- .../src/lib}/portal-status.service.ts | 2 +- .../services/src/lib}/sort.service.ts | 2 +- libs/services/tsconfig.json | 23 + libs/services/tsconfig.lib.json | 10 + libs/services/tsconfig.spec.json | 15 + libs/shared/interfaces/src/index.ts | 15 + .../interfaces/src/lib}/channel.model.ts | 0 .../interfaces/src/lib}/epg-channel.model.ts | 0 .../interfaces/src/lib}/epg-item.interface.ts | 0 .../interfaces/src/lib}/epg-program.model.ts | 0 .../interfaces/src/lib}/indexed-db.config.ts | 0 .../interfaces/src/lib}/ipc-command.class.ts | 0 .../interfaces/src/lib}/ipc-commands.ts | 15 +- .../interfaces/src/lib}/language.enum.ts | 0 .../interfaces/src/lib}/playlist-meta.type.ts | 2 +- .../interfaces/src/lib}/settings.interface.ts | 0 .../interfaces/src/lib}/store-keys.enum.ts | 0 .../interfaces/src/lib}/stream-format.enum.ts | 0 .../shared/interfaces/src/lib}/theme.enum.ts | 0 .../src/lib}/xtream-item.interface.ts | 0 .../src/lib}/xtream-serie-item.interface.ts | 0 libs/ui/components/README.md | 7 + libs/ui/components/eslint.config.mjs | 34 + libs/ui/components/jest.config.ts | 21 + libs/ui/components/project.json | 21 + libs/ui/components/src/index.ts | 16 + .../lib}/art-player/art-player.component.ts | 4 +- .../audio-player/audio-player.component.scss | 0 .../audio-player/audio-player.component.ts | 13 +- .../channel-list-container.component.html | 0 .../channel-list-container.component.scss | 0 .../channel-list-container.component.spec.ts | 10 +- .../channel-list-container.component.ts | 26 +- .../channel-list-item.component.scss | 0 .../channel-list-item.component.ts | 0 .../epg-item-description.component.html | 0 .../epg-item-description.component.scss | 0 .../epg-item-description.component.spec.ts | 2 +- .../epg-item-description.component.ts | 3 +- .../epg-list-item.component.html | 0 .../epg-list-item.component.scss | 0 .../epg-list-item.component.spec.ts | 6 +- .../epg-list-item/epg-list-item.component.ts | 6 +- .../src/lib}/epg-list/epg-list.component.html | 0 .../src/lib}/epg-list/epg-list.component.scss | 0 .../lib}/epg-list/epg-list.component.spec.ts | 12 +- .../src/lib}/epg-list/epg-list.component.ts | 60 +- .../html-video-player.component.html | 0 .../html-video-player.component.scss | 0 .../html-video-player.component.spec.ts | 2 +- .../html-video-player.component.ts | 28 +- .../info-overlay/info-overlay.component.html | 0 .../info-overlay/info-overlay.component.scss | 0 .../info-overlay.component.spec.ts | 14 +- .../info-overlay/info-overlay.component.ts | 5 +- .../multi-epg-container.component.html | 0 .../multi-epg-container.component.scss | 0 .../multi-epg-container.component.ts | 6 +- .../playlist-info.component.html | 152 ++ .../playlist-info/playlist-info.component.ts | 46 +- .../playlist-item.component.html | 0 .../playlist-item.component.scss | 0 .../playlist-item.component.spec.ts | 2 +- .../playlist-item/playlist-item.component.ts | 26 +- .../recent-playlists.component.html | 0 .../recent-playlists.component.scss | 0 .../recent-playlists.component.spec.ts | 11 +- .../recent-playlists.component.ts | 92 +- .../sidebar/sidebar.component.html | 0 .../sidebar/sidebar.component.scss | 0 .../video-player/sidebar/sidebar.component.ts | 7 +- .../toolbar/toolbar.component.html | 0 .../toolbar/toolbar.component.scss | 0 .../video-player/toolbar/toolbar.component.ts | 8 +- .../video-player/video-player.component.html | 14 +- .../video-player/video-player.component.scss | 0 .../video-player.component.spec.ts | 10 +- .../video-player/video-player.component.ts | 108 +- .../lib}/vjs-player/vjs-player.component.html | 0 .../lib}/vjs-player/vjs-player.component.scss | 0 .../lib}/vjs-player/vjs-player.component.ts | 0 libs/ui/components/src/test-setup.ts | 6 + libs/ui/components/tsconfig.json | 30 + libs/ui/components/tsconfig.lib.json | 17 + libs/ui/components/tsconfig.spec.json | 17 + libs/ui/pipes/README.md | 7 + libs/ui/pipes/eslint.config.mjs | 34 + libs/ui/pipes/jest.config.ts | 21 + libs/ui/pipes/project.json | 21 + libs/ui/pipes/src/index.ts | 4 + .../ui/pipes/src/lib}/filter-by-type.pipe.ts | 2 +- .../ui/pipes/src/lib}/filter.pipe.ts | 0 .../pipes/src/lib}/moment-date.pipe.spec.ts | 3 +- .../ui/pipes/src/lib}/moment-date.pipe.ts | 0 .../ui/pipes/src/lib}/sort.pipe.ts | 0 libs/ui/pipes/src/test-setup.ts | 6 + libs/ui/pipes/tsconfig.json | 30 + libs/ui/pipes/tsconfig.lib.json | 17 + libs/ui/pipes/tsconfig.spec.json | 17 + libs/ui/shared-portals/README.md | 2 + libs/ui/shared-portals/eslint.config.mjs | 34 + libs/ui/shared-portals/jest.config.ts | 21 + libs/ui/shared-portals/project.json | 25 + libs/ui/shared-portals/src/index.ts | 3 + .../src/lib}/epg-view/epg-view.component.html | 0 .../src/lib}/epg-view/epg-view.component.scss | 0 .../src/lib}/epg-view/epg-view.component.ts | 8 +- .../live-stream-layout.component.html | 0 .../live-stream-layout.component.scss | 0 .../live-stream-layout.component.ts | 16 +- .../web-player-view.component.html | 0 .../web-player-view.component.scss | 0 .../web-player-view.component.ts | 17 +- libs/ui/shared-portals/src/test-setup.ts | 6 + libs/ui/shared-portals/tsconfig.json | 30 + libs/ui/shared-portals/tsconfig.lib.json | 19 + libs/ui/shared-portals/tsconfig.spec.json | 22 + nx.json | 176 +- package-lock.json | 1665 ++++++++++++----- package.json | 7 +- tsconfig.base.json | 7 +- 237 files changed, 4015 insertions(+), 2969 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.html delete mode 100644 apps/web/src/app/services/whats-new.service.spec.ts delete mode 100644 apps/web/src/app/services/whats-new.service.stub.ts delete mode 100644 apps/web/src/app/services/whats-new.service.ts delete mode 100644 apps/web/src/assets/updates/0110/import-playlist-as-text.png delete mode 100644 apps/web/src/assets/updates/0110/multi-epg-view.png delete mode 100644 apps/web/src/assets/updates/0110/multiple-epg-sources.png delete mode 100644 apps/web/src/assets/updates/0130/mpv-player.png delete mode 100644 apps/web/src/assets/updates/060/channel-logos.png delete mode 100644 apps/web/src/assets/updates/060/custom-user-agent.png delete mode 100644 apps/web/src/assets/updates/060/dark-theme.png delete mode 100644 apps/web/src/assets/updates/070/auto-refresh.png delete mode 100644 apps/web/src/assets/updates/070/refresh-playlist.png delete mode 100644 apps/web/src/assets/updates/080/channel-info.png delete mode 100644 apps/web/src/assets/updates/080/translations.png delete mode 100644 apps/web/src/assets/updates/090/languages.png delete mode 100644 apps/web/src/assets/updates/090/reorder-playlists.gif delete mode 100644 apps/web/src/assets/updates/090/subtitle-option.png create mode 100644 libs/m3u-state/README.md create mode 100644 libs/m3u-state/eslint.config.mjs create mode 100644 libs/m3u-state/jest.config.ts create mode 100644 libs/m3u-state/project.json create mode 100644 libs/m3u-state/src/index.ts rename {apps/web/src/app/state => libs/m3u-state/src/lib}/actions.ts (95%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/effects.ts (89%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/playlists.state.ts (92%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/reducers.ts (89%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/router.selectors.ts (100%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/selectors.ts (76%) rename {apps/web/src/app/state => libs/m3u-state/src/lib}/state.ts (90%) create mode 100644 libs/m3u-state/src/test-setup.ts create mode 100644 libs/m3u-state/tsconfig.json create mode 100644 libs/m3u-state/tsconfig.lib.json create mode 100644 libs/m3u-state/tsconfig.spec.json create mode 100644 libs/services/README.md create mode 100644 libs/services/eslint.config.mjs create mode 100644 libs/services/jest.config.ts create mode 100644 libs/services/package.json create mode 100644 libs/services/project.json create mode 100644 libs/services/src/index.ts rename {apps/web/src/app/services => libs/services/src/lib}/data.service.ts (81%) rename {apps/web/src/app/services => libs/services/src/lib}/database.service.ts (99%) rename {apps/web/src/app/services => libs/services/src/lib}/dialog.service.spec.ts (79%) rename {apps/web/src/app/services => libs/services/src/lib}/dialog.service.ts (63%) rename {apps/web/src/app/services => libs/services/src/lib}/epg.service.spec.ts (98%) rename {apps/web/src/app/services => libs/services/src/lib}/epg.service.ts (86%) rename {apps/web/src/app/services => libs/services/src/lib}/playlists.service.ts (78%) rename {apps/web/src/app/services => libs/services/src/lib}/portal-status.service.ts (98%) rename {apps/web/src/app/services => libs/services/src/lib}/sort.service.ts (97%) create mode 100644 libs/services/tsconfig.json create mode 100644 libs/services/tsconfig.lib.json create mode 100644 libs/services/tsconfig.spec.json rename {apps/web/src/app/shared => libs/shared/interfaces/src/lib}/channel.model.ts (100%) rename {apps/web/src/app/player/models => libs/shared/interfaces/src/lib}/epg-channel.model.ts (100%) rename {apps/web/src/app/xtream => libs/shared/interfaces/src/lib}/epg-item.interface.ts (100%) rename {apps/web/src/app/player/models => libs/shared/interfaces/src/lib}/epg-program.model.ts (100%) rename {apps/web/src/app => libs/shared/interfaces/src/lib}/indexed-db.config.ts (100%) rename {apps/web/src/shared => libs/shared/interfaces/src/lib}/ipc-command.class.ts (100%) rename {apps/web/src/shared => libs/shared/interfaces/src/lib}/ipc-commands.ts (80%) rename {apps/web/src/app/settings => libs/shared/interfaces/src/lib}/language.enum.ts (100%) rename {apps/web/src/app/shared => libs/shared/interfaces/src/lib}/playlist-meta.type.ts (88%) rename {apps/web/src/app/settings => libs/shared/interfaces/src/lib}/settings.interface.ts (100%) rename {apps/web/src/app/shared/enums => libs/shared/interfaces/src/lib}/store-keys.enum.ts (100%) rename {apps/web/src/app/settings => libs/shared/interfaces/src/lib}/stream-format.enum.ts (100%) rename {apps/web/src/app/settings => libs/shared/interfaces/src/lib}/theme.enum.ts (100%) rename {apps/web/src/shared => libs/shared/interfaces/src/lib}/xtream-item.interface.ts (100%) rename {apps/web/src/shared => libs/shared/interfaces/src/lib}/xtream-serie-item.interface.ts (100%) create mode 100644 libs/ui/components/README.md create mode 100644 libs/ui/components/eslint.config.mjs create mode 100644 libs/ui/components/jest.config.ts create mode 100644 libs/ui/components/project.json create mode 100644 libs/ui/components/src/index.ts rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/art-player/art-player.component.ts (98%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/audio-player/audio-player.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/audio-player/audio-player.component.ts (94%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-container.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-container.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-container.component.spec.ts (97%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-container.component.ts (90%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-item/channel-list-item.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/channel-list-container/channel-list-item/channel-list-item.component.ts (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-item-description/epg-item-description.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-item-description/epg-item-description.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-item-description/epg-item-description.component.spec.ts (96%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-item-description/epg-item-description.component.ts (90%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list-item/epg-list-item.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list-item/epg-list-item.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list-item/epg-list-item.component.spec.ts (92%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list-item/epg-list-item.component.ts (81%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list.component.spec.ts (94%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/epg-list/epg-list.component.ts (85%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/html-video-player/html-video-player.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/html-video-player/html-video-player.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/html-video-player/html-video-player.component.spec.ts (95%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/html-video-player/html-video-player.component.ts (89%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/info-overlay/info-overlay.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/info-overlay/info-overlay.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/info-overlay/info-overlay.component.spec.ts (67%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/info-overlay/info-overlay.component.ts (92%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/multi-epg/multi-epg-container.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/multi-epg/multi-epg-container.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/multi-epg/multi-epg-container.component.ts (97%) create mode 100644 libs/ui/components/src/lib/recent-playlists/playlist-info/playlist-info.component.html rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/playlist-info/playlist-info.component.ts (85%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/playlist-item/playlist-item.component.html (100%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/playlist-item/playlist-item.component.scss (100%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/playlist-item/playlist-item.component.spec.ts (94%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/playlist-item/playlist-item.component.ts (75%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/recent-playlists.component.html (100%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/recent-playlists.component.scss (100%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/recent-playlists.component.spec.ts (92%) rename {apps/web/src/app/home => libs/ui/components/src/lib}/recent-playlists/recent-playlists.component.ts (80%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/sidebar/sidebar.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/sidebar/sidebar.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/sidebar/sidebar.component.ts (87%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/toolbar/toolbar.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/toolbar/toolbar.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/toolbar/toolbar.component.ts (91%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/video-player.component.html (90%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/video-player.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/video-player.component.spec.ts (90%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/video-player/video-player.component.ts (80%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/vjs-player/vjs-player.component.html (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/vjs-player/vjs-player.component.scss (100%) rename {apps/web/src/app/player/components => libs/ui/components/src/lib}/vjs-player/vjs-player.component.ts (100%) create mode 100644 libs/ui/components/src/test-setup.ts create mode 100644 libs/ui/components/tsconfig.json create mode 100644 libs/ui/components/tsconfig.lib.json create mode 100644 libs/ui/components/tsconfig.spec.json create mode 100644 libs/ui/pipes/README.md create mode 100644 libs/ui/pipes/eslint.config.mjs create mode 100644 libs/ui/pipes/jest.config.ts create mode 100644 libs/ui/pipes/project.json create mode 100644 libs/ui/pipes/src/index.ts rename {apps/web/src/app/shared/pipes => libs/ui/pipes/src/lib}/filter-by-type.pipe.ts (75%) rename {apps/web/src/app/shared/pipes => libs/ui/pipes/src/lib}/filter.pipe.ts (100%) rename {apps/web/src/app/shared/pipes => libs/ui/pipes/src/lib}/moment-date.pipe.spec.ts (73%) rename {apps/web/src/app/shared/pipes => libs/ui/pipes/src/lib}/moment-date.pipe.ts (100%) rename {apps/web/src/app/shared/pipes => libs/ui/pipes/src/lib}/sort.pipe.ts (100%) create mode 100644 libs/ui/pipes/src/test-setup.ts create mode 100644 libs/ui/pipes/tsconfig.json create mode 100644 libs/ui/pipes/tsconfig.lib.json create mode 100644 libs/ui/pipes/tsconfig.spec.json create mode 100644 libs/ui/shared-portals/README.md create mode 100644 libs/ui/shared-portals/eslint.config.mjs create mode 100644 libs/ui/shared-portals/jest.config.ts create mode 100644 libs/ui/shared-portals/project.json create mode 100644 libs/ui/shared-portals/src/index.ts rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/epg-view/epg-view.component.html (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/epg-view/epg-view.component.scss (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/epg-view/epg-view.component.ts (84%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/live-stream-layout/live-stream-layout.component.html (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/live-stream-layout/live-stream-layout.component.scss (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/live-stream-layout/live-stream-layout.component.ts (75%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/web-player-view/web-player-view.component.html (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/web-player-view/web-player-view.component.scss (100%) rename {apps/web/src/app/portals => libs/ui/shared-portals/src/lib}/web-player-view/web-player-view.component.ts (73%) create mode 100644 libs/ui/shared-portals/src/test-setup.ts create mode 100644 libs/ui/shared-portals/tsconfig.json create mode 100644 libs/ui/shared-portals/tsconfig.lib.json create mode 100644 libs/ui/shared-portals/tsconfig.spec.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index fc03295fa..000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/typescript-node/.devcontainer/base.Dockerfile - -# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster -ARG VARIANT="16-bullseye" -FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT} - -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends - -# [Optional] Uncomment if you want to install an additional version of node using nvm -ARG EXTRA_NODE_VERSION=16.10 -RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" - -# [Optional] Uncomment if you want to install more global node packages -# RUN su node -c "npm install -g " diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index b0277212a..000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,42 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.203.0/containers/typescript-node -{ - "name": "Node.js & TypeScript", - "runArgs": ["--init"], - "build": { - "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick a Node version: 16, 14, 12. - // Append -bullseye or -buster to pin to an OS version. - // Use -bullseye variants on local on arm64/Apple Silicon. - "args": { - "VARIANT": "16-bullseye" - } - }, - - // Set *default* container specific settings.json values on container create. - "settings": { - "editor.formatOnSave": true - }, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "dbaeumer.vscode-eslint", - "GitHub.copilot", - "esbenp.prettier-vscode", - "JohannesRudolph.file-ext-switcher", - "yzhang.markdown-all-in-one", - "streetsidesoftware.code-spell-checker", - "GitHub.vscode-pull-request-github", - "wayou.vscode-todo-highlight", - "Gruntfuggly.todo-tree" - ], - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "npm install", - - // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "node" -} diff --git a/.gitignore b/.gitignore index 18c36bbbd..ab4096c76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,64 +1,65 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See http://help.github.com/ignore-files/ for more about ignoring files. -# compiled output -/dist -/build -/tmp -/out-tsc -/app-builds -/release +#compiled output +/dist +/build +/tmp +/out-tsc +/app-builds +/release /e2e/tracing -/e2e/screenshots -/test-results -api.js -epg-worker.js -main.js -menu.js +/e2e/screenshots +/test-results +api.js +epg-worker.js +main.js +menu.js src/**/*.js -!src/karma.conf.js -*.js.map -data.db -preload.js -shared/*.js -playwright-report +!src/karma.conf.js +*.js.map +data.db +preload.js +shared/*.js +playwright-report .nx -server.js +server.js -# dependencies -/node_modules +# dependencies +/node_modules -# IDEs and editors -/.idea +# IDEs and editors +/.idea .project -.classpath -.c9/ -*.launch -.settings/ -*.sublime-workspace +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace -# IDE - VSCode +# IDE - VSCode .vscode/* -.vscode/settings.json -!.vscode/tasks.json +.vscode/settings.json +!.vscode/tasks.json !.vscode/launch.json -!.vscode/extensions.json +!.vscode/extensions.json -# misc -/.sass-cache -/connect.lock +# misc +/.sass-cache +/connect.lock /coverage -/libpeerconnection.log -npm-debug.log -testem.log -/typings -.angular/* +/libpeerconnection.log +npm-debug.log +testem.log +/typings +.angular/* # e2e -/e2e/*.js -!/e2e/protractor.conf.js -/e2e/*.map -/e2e/db +/e2e/*.js +!/e2e/protractor.conf.js +/e2e/*.map +/e2e/db -# System Files +# System Files .DS_Store -Thumbs.db +Thumbs.db +.angular diff --git a/.prettierignore b/.prettierignore index 3e7de75be..991c586b4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ -*.yml -dist -build -coverage -release \ No newline at end of file +*.yml +dist +build +coverage +release +.angular diff --git a/apps/electron-backend/src/app/api/main.preload.ts b/apps/electron-backend/src/app/api/main.preload.ts index ab62c2f51..00eb3efba 100644 --- a/apps/electron-backend/src/app/api/main.preload.ts +++ b/apps/electron-backend/src/app/api/main.preload.ts @@ -5,4 +5,7 @@ contextBridge.exposeInMainWorld('electron', { platform: process.platform, fetchPlaylistByUrl: (url: string) => ipcRenderer.invoke('fetch-playlist-by-url', url), + updatePlaylistFromFilePath: (filePath: string, title: string) => + ipcRenderer.invoke('update-playlist-from-file-path', filePath, title), + openPlaylistFromFile: () => ipcRenderer.invoke('open-playlist-from-file'), }); diff --git a/apps/electron-backend/src/app/events/playlist.events.ts b/apps/electron-backend/src/app/events/playlist.events.ts index d0dfba480..81cecee45 100644 --- a/apps/electron-backend/src/app/events/playlist.events.ts +++ b/apps/electron-backend/src/app/events/playlist.events.ts @@ -4,9 +4,10 @@ */ import axios from 'axios'; -import { ipcMain } from 'electron'; +import { dialog, ipcMain } from 'electron'; import { parse } from 'iptv-playlist-parser'; import { createPlaylistObject, getFilenameFromUrl } from 'm3u-utils'; +import { readFile } from 'node:fs/promises'; export default class PlaylistEvents { static bootstrapPlaylistEvents(): Electron.IpcMain { @@ -16,7 +17,6 @@ export default class PlaylistEvents { const https = require('https'); -// Retrieve app version ipcMain.handle('fetch-playlist-by-url', async (event, url) => { try { const agent = new https.Agent({ @@ -45,3 +45,57 @@ ipcMain.handle('fetch-playlist-by-url', async (event, url) => { throw error; } }); + +ipcMain.handle( + 'update-playlist-from-file-path', + async (event, filePath, title) => { + const playlist = await readFile(filePath, 'utf-8'); + const parsedPlaylist = parse(playlist); + const playlistObject = createPlaylistObject( + title, + parsedPlaylist, + filePath, + 'FILE' + ); + return playlistObject; + } +); + +ipcMain.handle('open-playlist-from-file', async () => { + // 1. Await the result from the dialog + const { canceled, filePaths } = await dialog.showOpenDialog({ + properties: ['openFile'], + filters: [ + { name: 'Playlists', extensions: ['m3u', 'm3u8', 'pls', 'txt'] }, + { name: 'All Files', extensions: ['*'] }, + ], + }); + + if (canceled || filePaths.length === 0) { + console.log('User canceled file open dialog.'); + return null; + } + + const filePath = filePaths[0]; + + try { + const fileContent = await readFile(filePath, 'utf-8'); + + const parsedPlaylist = parse(fileContent); + const playlistObject = createPlaylistObject( + 'from file', + parsedPlaylist, + filePath, + 'FILE' + ); + + console.log('Sending playlist object to renderer:', playlistObject); + + // 5. Return the final object. This value is sent back to Angular. + return playlistObject; + } catch (error) { + console.error('Error reading or parsing the file:', error); + // It's good practice to throw the error so the renderer can catch it + throw new Error('Failed to process the selected file.'); + } +}); diff --git a/apps/web/eslint.config.mjs b/apps/web/eslint.config.mjs index 9b3aa715c..cd8ecd4da 100644 --- a/apps/web/eslint.config.mjs +++ b/apps/web/eslint.config.mjs @@ -2,33 +2,36 @@ import nx from '@nx/eslint-plugin'; import baseConfig from '../../eslint.config.mjs'; export default [ - ...baseConfig, - ...nx.configs['flat/angular'], - ...nx.configs['flat/angular-template'], - { - files: ['**/*.ts'], - rules: { - '@angular-eslint/directive-selector': [ - 'error', - { - type: 'attribute', - prefix: 'app', - style: 'camelCase', + ...baseConfig, + ...nx.configs['flat/angular'], + ...nx.configs['flat/angular-template'], + { + files: ['**/*.ts'], + rules: { + '@angular-eslint/directive-selector': [ + 'error', + { + type: 'attribute', + prefix: 'app', + style: 'camelCase', + }, + ], + '@angular-eslint/component-selector': [ + 'error', + { + type: 'element', + prefix: 'app', + style: 'kebab-case', + }, + ], + }, + }, + { + files: ['**/*.html'], + // Override or add rules here + rules: { + '@angular-eslint/template/click-events-have-key-events': 'off', + '@angular-eslint/template/interactive-supports-focus': 'off', }, - ], - '@angular-eslint/component-selector': [ - 'error', - { - type: 'element', - prefix: 'app', - style: 'kebab-case', - }, - ], }, - }, - { - files: ['**/*.html'], - // Override or add rules here - rules: {}, - }, ]; diff --git a/apps/web/project.json b/apps/web/project.json index 9826b30d2..3a6db88bc 100644 --- a/apps/web/project.json +++ b/apps/web/project.json @@ -30,6 +30,7 @@ }, "configurations": { "production": { + "baseHref": "./", "budgets": [ { "type": "initial", diff --git a/apps/web/src/app/app-routing.module.ts b/apps/web/src/app/app-routing.module.ts index 4fc628b99..4d41d63b7 100644 --- a/apps/web/src/app/app-routing.module.ts +++ b/apps/web/src/app/app-routing.module.ts @@ -13,23 +13,17 @@ const routes: Routes = [ { path: 'playlists', loadComponent: () => - import( - './player/components/video-player/video-player.component' - ).then((c) => c.VideoPlayerComponent), + import('components').then((c) => c.VideoPlayerComponent), }, { path: 'iptv', loadComponent: () => - import( - './player/components/video-player/video-player.component' - ).then((c) => c.VideoPlayerComponent), + import('components').then((c) => c.VideoPlayerComponent), }, { path: 'playlists/:id', loadComponent: () => - import( - './player/components/video-player/video-player.component' - ).then((c) => c.VideoPlayerComponent), + import('components').then((c) => c.VideoPlayerComponent), }, { path: 'settings', diff --git a/apps/web/src/app/app.component.html b/apps/web/src/app/app.component.html index d2aa479f4..67e7bd4cd 100644 --- a/apps/web/src/app/app.component.html +++ b/apps/web/src/app/app.component.html @@ -1,9 +1 @@ - - -@if (isDialogVisible$ | async) { - -} + diff --git a/apps/web/src/app/app.component.spec.ts b/apps/web/src/app/app.component.spec.ts index 8a21096dc..2061a1fb9 100644 --- a/apps/web/src/app/app.component.spec.ts +++ b/apps/web/src/app/app.component.spec.ts @@ -14,16 +14,16 @@ import { MockComponent, MockModule, MockPipe, MockProviders } from 'ng-mocks'; import { NgxIndexedDBService } from 'ngx-indexed-db'; import { NgxWhatsNewComponent } from 'ngx-whats-new'; import { of } from 'rxjs'; +import { DataService } from '../../../../libs/services/src/lib/data.service'; +import { PlaylistsService } from '../../../../libs/services/src/lib/playlists.service'; +import { Language } from '../../../../libs/shared/interfaces/src/lib/language.enum'; +import { STORE_KEY } from '../../../../libs/shared/interfaces/src/lib/store-keys.enum'; +import { Theme } from '../../../../libs/shared/interfaces/src/lib/theme.enum'; import { AppComponent } from './app.component'; -import { DataService } from './services/data.service'; import { ElectronServiceStub } from './services/electron.service.stub'; -import { PlaylistsService } from './services/playlists.service'; import { SettingsService } from './services/settings.service'; import { WhatsNewService } from './services/whats-new.service'; import { WhatsNewServiceStub } from './services/whats-new.service.stub'; -import { Language } from './settings/language.enum'; -import { Theme } from './settings/theme.enum'; -import { STORE_KEY } from './shared/enums/store-keys.enum'; jest.spyOn(global.console, 'error').mockImplementation(() => {}); diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 65f81e8df..c881504eb 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -4,25 +4,23 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; -import * as semver from 'semver'; -import { IpcCommand } from '../shared/ipc-command.class'; +/* import * as semver from 'semver'; */ +import * as PlaylistActions from 'm3u-state'; import { ERROR, + IpcCommand, + Language, OPEN_FILE, + Settings, SETTINGS_UPDATE, - SHOW_WHATS_NEW, + STORE_KEY, + Theme, VIEW_ADD_PLAYLIST, VIEW_SETTINGS, -} from '../shared/ipc-commands'; -import { DataService } from './services/data.service'; -import { EpgService } from './services/epg.service'; +} from 'shared-interfaces'; +import { DataService } from '../../../../libs/services/src/lib/data.service'; +import { EpgService } from '../../../../libs/services/src/lib/epg.service'; import { SettingsService } from './services/settings.service'; -import { WhatsNewService } from './services/whats-new.service'; -import { Language } from './settings/language.enum'; -import { Settings } from './settings/settings.interface'; -import { Theme } from './settings/theme.enum'; -import { STORE_KEY } from './shared/enums/store-keys.enum'; -import * as PlaylistActions from './state/actions'; import { RecentlyViewedComponent } from './xtream-tauri/recently-viewed/recently-viewed.component'; import { SearchResultsComponent } from './xtream-tauri/search-results/search-results.component'; @@ -40,22 +38,11 @@ export class AppComponent implements OnInit, OnDestroy { private snackBar = inject(MatSnackBar); private translate = inject(TranslateService); private settingsService = inject(SettingsService); - private whatsNewService = inject(WhatsNewService); - - /** Visibility flag of the "what is new" modal dialog */ - readonly isDialogVisible$ = this.whatsNewService.dialogState$; - - /** Dialog options */ - readonly options = this.whatsNewService.options; - - /** Modals to show for the updated version of the application */ - modals: any[] = []; /** List of ipc commands with function mapping */ private readonly commandsList = [ new IpcCommand(VIEW_ADD_PLAYLIST, () => this.navigateToRoute('/')), new IpcCommand(VIEW_SETTINGS, () => this.navigateToRoute('/settings')), - new IpcCommand(SHOW_WHATS_NEW, () => this.showWhatsNewDialog()), new IpcCommand(ERROR, (response: { message: string; status: number }) => this.showErrorAsNotification(response) ), @@ -107,7 +94,7 @@ export class AppComponent implements OnInit, OnDestroy { this.setRendererListeners(); this.initSettings(); - this.handleWhatsNewDialog(); + /* this.handleWhatsNewDialog(); */ } /** @@ -173,36 +160,17 @@ export class AppComponent implements OnInit, OnDestroy { /** * Checks the actual version of the application and shows the "what is new" dialog if the updated version was detected */ - handleWhatsNewDialog(): void { + /* handleWhatsNewDialog(): void { const actualVersion = this.dataService.getAppVersion(); this.settingsService .getValueFromLocalStorage(STORE_KEY.Version) - .subscribe((version: string) => { - const isNewVersion = semver.gt( - actualVersion, - version || '0.0.0' - ); - if (!version || isNewVersion) { - this.modals = - this.whatsNewService.getModalsByVersion(actualVersion); - this.setDialogVisibility(true); - } + .subscribe(() => { this.settingsService.setValueToLocalStorage( STORE_KEY.Version, actualVersion ); }); - } - - /** - * Sets the visibility flag of the modal window - * @param visible show/hide window flag - */ - setDialogVisibility(visible: boolean): void { - if (this.modals.length > 0) { - this.whatsNewService.changeDialogVisibleState(visible); - } - } + } */ /** * Navigate to the specified route @@ -212,16 +180,6 @@ export class AppComponent implements OnInit, OnDestroy { this.router.navigateByUrl(route); } - /** - * Shows the "what is new" dialog - */ - showWhatsNewDialog(): void { - this.modals = this.whatsNewService.getModalsByVersion( - this.dataService.getAppVersion() - ); - this.setDialogVisibility(true); - } - showErrorAsNotification(response: { message: string; status: number }) { this.snackBar.open( `Error: ${response?.message ?? 'Something went wrong'} (Status: ${ diff --git a/apps/web/src/app/app.module.ts b/apps/web/src/app/app.module.ts index 73ee8da7b..a6d6af81e 100644 --- a/apps/web/src/app/app.module.ts +++ b/apps/web/src/app/app.module.ts @@ -7,27 +7,23 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ServiceWorkerModule } from '@angular/service-worker'; +import { DataService } from '@iptvnator/services'; import { EffectsModule } from '@ngrx/effects'; import { StoreRouterConnectingModule, routerReducer } from '@ngrx/router-store'; import { StoreModule } from '@ngrx/store'; import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -import { isTauri } from '@tauri-apps/api/core'; +import { PlaylistEffects, playlistReducer } from 'm3u-state'; import { NgxIndexedDBModule, NgxIndexedDBService } from 'ngx-indexed-db'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { NgxWhatsNewModule } from 'ngx-whats-new'; -import 'reflect-metadata'; +import { dbConfig } from 'shared-interfaces'; import { AppConfig } from '../environments/environment'; import '../polyfills'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { dbConfig } from './indexed-db.config'; -import { DataService } from './services/data.service'; import { PwaService } from './services/pwa.service'; import { TauriService } from './services/tauri.service'; -import { PlaylistEffects } from './state/effects'; -import { playlistReducer } from './state/reducers'; // AoT requires an exported function for factories export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader { @@ -54,7 +50,6 @@ export function DataFactory() { AppConfig.environment === 'WEB' ? NgxIndexedDBModule.forRoot(dbConfig) : [], - NgxWhatsNewModule, NgxIndexedDBModule.forRoot(dbConfig), NgxSkeletonLoaderModule.forRoot({ animation: 'pulse', @@ -68,7 +63,7 @@ export function DataFactory() { }, }), ServiceWorkerModule.register('ngsw-worker.js', { - enabled: AppConfig.production && !isTauri(), + enabled: AppConfig.production && !!window.electron, registrationStrategy: 'registerWhenStable:30000', }), StoreModule.forRoot({ diff --git a/apps/web/src/app/home/file-upload/file-upload.component.ts b/apps/web/src/app/home/file-upload/file-upload.component.ts index 56b478343..b4de5ff75 100644 --- a/apps/web/src/app/home/file-upload/file-upload.component.ts +++ b/apps/web/src/app/home/file-upload/file-upload.component.ts @@ -2,10 +2,7 @@ import { Component, EventEmitter, inject, Output } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; -import { isTauri } from '@tauri-apps/api/core'; -import { open } from '@tauri-apps/plugin-dialog'; -import { readTextFile } from '@tauri-apps/plugin-fs'; -import { parsePlaylist } from '../../state/actions'; +import { addPlaylist } from 'm3u-state'; import { DragDropFileUploadDirective } from './drag-drop-file-upload.directive'; @Component({ @@ -25,6 +22,8 @@ export class FileUploadComponent { private readonly store = inject(Store); + private isDesktop = !!window.electron; + allowedContentTypes = [ 'application/mpegurl', 'application/x-mpegurl', @@ -36,27 +35,26 @@ export class FileUploadComponent { ]; async openDialog(fileField: HTMLInputElement) { - if (isTauri()) { - const path = await open({ - multiple: false, - directory: false, - filters: [ - { - name: 'Playlist files', - extensions: ['m3u', 'm3u8'], - }, - ], - }); - const title = path.split('/').pop(); - const fileContent = await readTextFile(path); - this.store.dispatch( - parsePlaylist({ - uploadType: 'FILE', - playlist: fileContent, - title, - path, + if (this.isDesktop) { + window.electron + .openPlaylistFromFile() + .then((playlistObject) => { + if (playlistObject) { + console.log( + 'Received playlist from Electron:', + playlistObject + ); + this.store.dispatch( + addPlaylist({ playlist: playlistObject }) + ); + } else { + // User canceled the dialog + console.log('File selection was canceled.'); + } }) - ); + .catch((error) => { + console.error('Error opening file:', error); + }); this.closeDialog.emit(); } else { fileField.click(); @@ -64,6 +62,8 @@ export class FileUploadComponent { } upload(fileList: FileList) { + if (this.isDesktop) return; + if (!this.allowedContentTypes.includes(fileList[0].type)) { this.fileRejected.emit(fileList[0].name); return; diff --git a/apps/web/src/app/home/home.component.spec.ts b/apps/web/src/app/home/home.component.spec.ts index c378d69f1..5059a194b 100644 --- a/apps/web/src/app/home/home.component.spec.ts +++ b/apps/web/src/app/home/home.component.spec.ts @@ -10,10 +10,10 @@ import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { Observable } from 'rxjs'; -import { DataService } from '../services/data.service'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; +import { RecentPlaylistsComponent } from '../../../../../libs/ui/components/src/lib/recent-playlists/recent-playlists.component'; import { ElectronServiceStub } from '../services/electron.service.stub'; import { HomeComponent } from './home.component'; -import { RecentPlaylistsComponent } from './recent-playlists/recent-playlists.component'; describe('HomeComponent', () => { let component: HomeComponent; diff --git a/apps/web/src/app/home/home.component.ts b/apps/web/src/app/home/home.component.ts index 0438db85a..632f5cd73 100644 --- a/apps/web/src/app/home/home.component.ts +++ b/apps/web/src/app/home/home.component.ts @@ -1,14 +1,13 @@ import { Component, inject, OnDestroy } from '@angular/core'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { DataService } from '@iptvnator/services'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; -import { Playlist } from 'shared-interfaces'; -import { ERROR, PLAYLIST_PARSE_RESPONSE } from '../../shared/ipc-commands'; -import { DataService } from '../services/data.service'; +import { addPlaylist } from 'm3u-state'; +import { ERROR, Playlist, PLAYLIST_PARSE_RESPONSE } from 'shared-interfaces'; +import { RecentPlaylistsComponent } from '../../../../../libs/ui/components/src/lib/recent-playlists/recent-playlists.component'; import { HeaderComponent } from '../shared/components/header/header.component'; -import { addPlaylist } from '../state/actions'; -import { RecentPlaylistsComponent } from './recent-playlists/recent-playlists.component'; @Component({ selector: 'app-home', diff --git a/apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.html b/apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.html deleted file mode 100644 index dfecda1db..000000000 --- a/apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.html +++ /dev/null @@ -1,124 +0,0 @@ -
-

- {{ 'HOME.PLAYLISTS.INFO_DIALOG.PLAYLIST_DETAILS' | translate }} -

- - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.TITLE' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.SERVER_URL' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.MAC_ADDRESS' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.SERVER_URL' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.USERNAME' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.PASSWORD' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.FROM_URL' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.ORIGINAL_FILENAME' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.IMPORT_DATE' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.CHANNELS' | translate - }} - - - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.USER_AGENT' | translate - }} - - {{ - 'HOME.PLAYLISTS.INFO_DIALOG.CUSTOM_USER_AGENT' | translate - }} - - - - {{ 'HOME.PLAYLISTS.INFO_DIALOG.FILE_PATH' | translate }} - - - - {{ 'HOME.PLAYLISTS.INFO_DIALOG.UPDATE_FAILED' | translate }} - - - - - {{ 'HOME.PLAYLISTS.INFO_DIALOG.AUTO_UPDATE' | translate }} - -

- {{ - 'HOME.PLAYLISTS.INFO_DIALOG.AUTO_UPDATE_DESCRIPTION' - | translate - }} -

- - - - - - - - -
diff --git a/apps/web/src/app/home/stalker-portal-import/stalker-portal-import.component.ts b/apps/web/src/app/home/stalker-portal-import/stalker-portal-import.component.ts index 40b91299a..3174c17c4 100644 --- a/apps/web/src/app/home/stalker-portal-import/stalker-portal-import.component.ts +++ b/apps/web/src/app/home/stalker-portal-import/stalker-portal-import.component.ts @@ -11,10 +11,10 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; +import { addPlaylist } from 'm3u-state'; import { Playlist } from 'shared-interfaces'; import { v4 as uuid } from 'uuid'; -import { DataService } from '../../services/data.service'; -import { addPlaylist } from '../../state/actions'; +import { DataService } from '../../../../../../libs/services/src/lib/data.service'; @Component({ imports: [ diff --git a/apps/web/src/app/home/url-upload/url-upload.component.spec.ts b/apps/web/src/app/home/url-upload/url-upload.component.spec.ts index 940b8605c..4d9263bd4 100644 --- a/apps/web/src/app/home/url-upload/url-upload.component.spec.ts +++ b/apps/web/src/app/home/url-upload/url-upload.component.spec.ts @@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; import { MockModule } from 'ng-mocks'; -import { DataService } from '../../services/data.service'; +import { DataService } from '../../../../../../libs/services/src/lib/data.service'; import { ElectronServiceStub } from '../../services/electron.service.stub'; import { UrlUploadComponent } from './url-upload.component'; diff --git a/apps/web/src/app/home/url-upload/url-upload.component.ts b/apps/web/src/app/home/url-upload/url-upload.component.ts index 7b6f7945b..29020ad95 100644 --- a/apps/web/src/app/home/url-upload/url-upload.component.ts +++ b/apps/web/src/app/home/url-upload/url-upload.component.ts @@ -21,7 +21,7 @@ export class UrlUploadComponent implements OnInit { @Output() urlAdded: EventEmitter = new EventEmitter(); form: FormGroup; - readonly isDesktop = window.electron; + readonly isDesktop = !!window.electron; ngOnInit() { const urlRegex = '(https?://.*?)'; diff --git a/apps/web/src/app/home/xtream-code-import/xtream-code-import.component.ts b/apps/web/src/app/home/xtream-code-import/xtream-code-import.component.ts index 4de99414e..1cbcc263d 100644 --- a/apps/web/src/app/home/xtream-code-import/xtream-code-import.component.ts +++ b/apps/web/src/app/home/xtream-code-import/xtream-code-import.component.ts @@ -12,13 +12,13 @@ import { MatIcon } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; +import { addPlaylist } from 'm3u-state'; import { Playlist } from 'shared-interfaces'; import { v4 as uuid } from 'uuid'; import { PortalStatus, PortalStatusService, -} from '../../services/portal-status.service'; -import { addPlaylist } from '../../state/actions'; +} from '../../../../../../libs/services/src/lib/portal-status.service'; @Component({ imports: [ diff --git a/apps/web/src/app/services/player.service.ts b/apps/web/src/app/services/player.service.ts index 0850e33ba..6c9a03784 100644 --- a/apps/web/src/app/services/player.service.ts +++ b/apps/web/src/app/services/player.service.ts @@ -1,13 +1,16 @@ import { Injectable, inject } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { OPEN_MPV_PLAYER, OPEN_VLC_PLAYER } from '../../shared/ipc-commands'; -import { VideoPlayer } from '../settings/settings.interface'; +import { + OPEN_MPV_PLAYER, + OPEN_VLC_PLAYER, + VideoPlayer, +} from 'shared-interfaces'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; import { ExternalPlayerInfoDialogComponent } from '../shared/components/external-player-info-dialog/external-player-info-dialog.component'; import { PlayerDialogComponent, PlayerDialogData, } from '../xtream-tauri/player-dialog/player-dialog.component'; -import { DataService } from './data.service'; import { SettingsStore } from './settings-store.service'; @Injectable({ diff --git a/apps/web/src/app/services/pwa.service.ts b/apps/web/src/app/services/pwa.service.ts index 002fb3cf4..95fbedb09 100644 --- a/apps/web/src/app/services/pwa.service.ts +++ b/apps/web/src/app/services/pwa.service.ts @@ -5,20 +5,20 @@ import { Params } from '@angular/router'; import { SwUpdate } from '@angular/service-worker'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; +import * as PlaylistActions from 'm3u-state'; import { catchError, firstValueFrom, throwError } from 'rxjs'; -import { Playlist } from 'shared-interfaces'; -import { AppConfig } from '../../environments/environment'; import { ERROR, + Playlist, PLAYLIST_PARSE_BY_URL, PLAYLIST_PARSE_RESPONSE, PLAYLIST_UPDATE, STALKER_REQUEST, XTREAM_REQUEST, XTREAM_RESPONSE, -} from '../../shared/ipc-commands'; -import * as PlaylistActions from '../state/actions'; -import { DataService } from './data.service'; +} from 'shared-interfaces'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; +import { AppConfig } from '../../environments/environment'; @Injectable({ providedIn: 'root', diff --git a/apps/web/src/app/services/settings-store.service.ts b/apps/web/src/app/services/settings-store.service.ts index 19d180a91..3f50a2870 100644 --- a/apps/web/src/app/services/settings-store.service.ts +++ b/apps/web/src/app/services/settings-store.service.ts @@ -8,11 +8,14 @@ import { } from '@ngrx/signals'; import { StorageMap } from '@ngx-pwa/local-storage'; import { firstValueFrom } from 'rxjs'; -import { Language } from '../settings/language.enum'; -import { Settings, VideoPlayer } from '../settings/settings.interface'; -import { StreamFormat } from '../settings/stream-format.enum'; -import { Theme } from '../settings/theme.enum'; -import { STORE_KEY } from '../shared/enums/store-keys.enum'; +import { Language } from '../../../../../libs/shared/interfaces/src/lib/language.enum'; +import { + Settings, + VideoPlayer, +} from '../../../../../libs/shared/interfaces/src/lib/settings.interface'; +import { STORE_KEY } from '../../../../../libs/shared/interfaces/src/lib/store-keys.enum'; +import { StreamFormat } from '../../../../../libs/shared/interfaces/src/lib/stream-format.enum'; +import { Theme } from '../../../../../libs/shared/interfaces/src/lib/theme.enum'; const DEFAULT_SETTINGS: Settings = { player: VideoPlayer.VideoJs, diff --git a/apps/web/src/app/services/settings.service.spec.ts b/apps/web/src/app/services/settings.service.spec.ts index ea9240144..5aa1d2906 100644 --- a/apps/web/src/app/services/settings.service.spec.ts +++ b/apps/web/src/app/services/settings.service.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; import { StorageMap } from '@ngx-pwa/local-storage'; import { of } from 'rxjs'; -import { Theme } from '../settings/theme.enum'; -import { STORE_KEY } from '../shared/enums/store-keys.enum'; +import { STORE_KEY } from '../../../../../libs/shared/interfaces/src/lib/store-keys.enum'; +import { Theme } from '../../../../../libs/shared/interfaces/src/lib/theme.enum'; import { SettingsService } from './settings.service'; describe('Service: Settings', () => { diff --git a/apps/web/src/app/services/settings.service.ts b/apps/web/src/app/services/settings.service.ts index 30d7040f0..d484bb1ba 100644 --- a/apps/web/src/app/services/settings.service.ts +++ b/apps/web/src/app/services/settings.service.ts @@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { StorageMap } from '@ngx-pwa/local-storage'; import { catchError, map, Observable } from 'rxjs'; -import { STORE_KEY } from '../shared/enums/store-keys.enum'; -import { Theme } from './../settings/theme.enum'; +import { STORE_KEY } from '../../../../../libs/shared/interfaces/src/lib/store-keys.enum'; +import { Theme } from '../../../../../libs/shared/interfaces/src/lib/theme.enum'; @Injectable({ providedIn: 'root', diff --git a/apps/web/src/app/services/tauri.service.ts b/apps/web/src/app/services/tauri.service.ts index 99db16d8c..a0ee902f8 100644 --- a/apps/web/src/app/services/tauri.service.ts +++ b/apps/web/src/app/services/tauri.service.ts @@ -7,20 +7,20 @@ import { readTextFile } from '@tauri-apps/plugin-fs'; import { fetch } from '@tauri-apps/plugin-http'; import { parse } from 'iptv-playlist-parser'; import { createPlaylistObject } from 'm3u-utils'; -import { Playlist } from 'shared-interfaces'; -import { AppConfig } from '../../environments/environment'; import { AUTO_UPDATE_PLAYLISTS, AUTO_UPDATE_PLAYLISTS_RESPONSE, EPG_GET_PROGRAM_DONE, ERROR, + Playlist, PLAYLIST_PARSE_BY_URL, PLAYLIST_PARSE_RESPONSE, PLAYLIST_UPDATE, PLAYLIST_UPDATE_RESPONSE, XTREAM_RESPONSE, -} from '../../shared/ipc-commands'; -import { DataService } from './data.service'; +} from 'shared-interfaces'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; +import { AppConfig } from '../../environments/environment'; @Injectable({ providedIn: 'root', @@ -56,32 +56,16 @@ export class TauriService extends DataService { async sendIpcEvent(type: string, payload?: unknown) { if (type === PLAYLIST_PARSE_BY_URL) { - this.fetchFromUrl(payload); + this.fetchM3uPlaylistFromUrl(payload); } else if (type === PLAYLIST_UPDATE) { - const data = payload as { - id: string; - filePath: string; - title: string; - }; - const playlist = await readTextFile(data.filePath); - const parsedPlaylist = parse(playlist); - const playlistObject = createPlaylistObject( - data.title, - parsedPlaylist, - data.filePath, - 'FILE' + // TODO: update playlist from URL? + this.updateM3uPlaylistFromFile( + payload as { + id: string; + filePath: string; + title: string; + } ); - - window.postMessage({ - type: PLAYLIST_UPDATE_RESPONSE, - payload: { - message: 'Success! The playlist was successfully updated', - playlist: { - ...playlistObject, - _id: data.id, - }, - }, - }); } else if (type === 'XTREAM_REQUEST') { return await this.forwardXtreamRequest( payload as { url: string; params: Record } @@ -164,7 +148,7 @@ export class TauriService extends DataService { } } - async fetchStalkerData(payload: { + private async fetchStalkerData(payload: { url: string; macAddress: string; params: Record; @@ -205,49 +189,39 @@ export class TauriService extends DataService { } } - async fetchFromUrl(payload: Partial) { + private async fetchM3uPlaylistFromUrl(payload: Partial) { window.electron.fetchPlaylistByUrl(payload.url).then((result) => { + // TODO: call store and decide and store where to store based on the isTemporary flag etc window.postMessage({ type: PLAYLIST_PARSE_RESPONSE, payload: { ...result, isTemporary: payload.isTemporary }, }); }); - /* try { - const response = await fetch(payload.url); - const responseBody = await response.text(); - const parsedPlaylist = parse(responseBody); - - // Extract playlist name from URL, use "Imported from URL" as fallback - const extractedName = - payload.url && payload.url.length > 1 - ? getFilenameFromUrl(payload.url) - : ''; - const playlistName = - !extractedName || extractedName === 'Untitled playlist' - ? 'Imported from URL' - : extractedName; - - const playlist = createPlaylistObject( - playlistName, - parsedPlaylist, - payload.url, - 'URL' - ); - - window.postMessage({ - type: PLAYLIST_PARSE_RESPONSE, - payload: { ...playlist, isTemporary: payload.isTemporary }, - }); - } catch (error) { - window.postMessage({ - type: ERROR, - message: this.getErrorMessageByStatusCode(error.status), - status: error.status, - }); - } */ } - getErrorMessageByStatusCode(status: number) { + private async updateM3uPlaylistFromFile(data: { + id: string; + filePath: string; + title: string; + }) { + window.electron + .updatePlaylistFromFilePath(data.filePath, data.title) + .then((playlistObject) => { + window.postMessage({ + type: PLAYLIST_UPDATE_RESPONSE, + payload: { + message: + 'Success! The playlist was successfully updated', + playlist: { + ...playlistObject, + _id: data.id, + }, + }, + }); + }); + } + + /* private getErrorMessageByStatusCode(status: number) { let message = 'Something went wrong'; switch (status) { case 0: @@ -261,9 +235,9 @@ export class TauriService extends DataService { break; } return message; - } + } */ - async forwardXtreamRequest(payload: { + private async forwardXtreamRequest(payload: { url: string; params: Record; }) { @@ -347,7 +321,6 @@ export class TauriService extends DataService { ); } - console.log(url, queryParams); const result = await response.json(); return result; } diff --git a/apps/web/src/app/services/whats-new.service.spec.ts b/apps/web/src/app/services/whats-new.service.spec.ts deleted file mode 100644 index bc36c6cfa..000000000 --- a/apps/web/src/app/services/whats-new.service.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* eslint-disable @typescript-eslint/unbound-method */ -import { TestBed, inject } from '@angular/core/testing'; -import { WhatsNewService } from './whats-new.service'; - -describe('Service: WhatsNew', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [WhatsNewService], - }); - }); - - it('should ...', inject([WhatsNewService], (service: WhatsNewService) => { - expect(service).toBeTruthy(); - })); - - it('should change the state', inject( - [WhatsNewService], - (service: WhatsNewService) => { - jest.spyOn(service.dialogState$, 'next'); - service.changeDialogVisibleState(true); - expect(service.dialogState$.next).toHaveBeenCalledTimes(1); - expect(service.dialogState$.next).toHaveBeenCalledWith(true); - service.changeDialogVisibleState(false); - expect(service.dialogState$.next).toHaveBeenCalledTimes(2); - expect(service.dialogState$.next).toHaveBeenCalledWith(false); - } - )); - - it('should return modal windows for the requested version ', inject( - [WhatsNewService], - (service: WhatsNewService) => { - const version = '0.6.0'; - const modals = service.getModalsByVersion(version); - expect(modals).toBeDefined(); - expect(modals).toHaveLength(service.modals[version].length); - } - )); -}); diff --git a/apps/web/src/app/services/whats-new.service.stub.ts b/apps/web/src/app/services/whats-new.service.stub.ts deleted file mode 100644 index c8f05b035..000000000 --- a/apps/web/src/app/services/whats-new.service.stub.ts +++ /dev/null @@ -1,6 +0,0 @@ -export class WhatsNewServiceStub { - changeDialogVisibleState(): void {} - getModalsByVersion(): any { - return []; - } -} diff --git a/apps/web/src/app/services/whats-new.service.ts b/apps/web/src/app/services/whats-new.service.ts deleted file mode 100644 index 78a557e24..000000000 --- a/apps/web/src/app/services/whats-new.service.ts +++ /dev/null @@ -1,315 +0,0 @@ -import { Injectable } from '@angular/core'; -/* import { ModalWindow } from 'ngx-whats-new/lib/modal-window.interface'; */ -import { BehaviorSubject } from 'rxjs'; - -@Injectable({ - providedIn: 'root', -}) -export class WhatsNewService { - /** Visibility state of the modal */ - dialogState$ = new BehaviorSubject(false); - - /** Array with all available modals */ - modals = { - '0.6.0': [ - { - imageHeight: 470, - imageBgColor: '#333', - imageSrc: './assets/updates/060/dark-theme.png', - title: 'New in v0.6.0 - Dark theme 🎉', - text: 'Finally, the dark theme is now available. Check the settings page of the application to change the theme.', - button: { - text: 'OKAY', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 470, - imageBgColor: '#333', - imageSrc: './assets/updates/060/channel-logos.png', - title: 'Channel logos 📺', - text: 'The channel list was extended with the visualization of logotypes (only visible if they are defined in the playlist)', - button: { - text: 'OKAY', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 470, - imageBgColor: '#333', - imageSrc: './assets/updates/060/custom-user-agent.png', - title: 'Custom user agent 🕵️‍♂️', - text: 'Some IPTV providers need a specific user-agent in order to play their playlist. Support of custom user agent is available now.', - button: { - text: 'GOT IT', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.7.0': [ - { - imageHeight: 500, - imageBgColor: '#333', - imageSrc: './assets/updates/070/refresh-playlist.png', - title: 'New in v0.7.0 - Refresh playlists 🎉', - text: "Now you don't have to delete and re-add a playlist if it changes, you can simply update it directly from the user interface.", - button: { - text: 'Nice!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 500, - imageBgColor: '#333', - imageSrc: './assets/updates/070/auto-refresh.png', - title: 'Auto-refresh playlists 🎉', - text: 'In addition, an auto-refresh playlist function is available so that the playlists will be updated automatically every time the app is started.', - button: { - text: 'Okay', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.8.0': [ - { - imageHeight: 310, - imageBgColor: '#333', - imageSrc: './assets/updates/080/translations.png', - title: 'New in v0.8.0 - New translations 🎉', - html: 'The new release includes the localization of the application into two new languages: Korean and Spanish. Many thanks to the contributors for the translation! (@chaeya, @sguinetti, anthonyaxenov)', - button: { - text: 'Nice!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - title: 'User-Agent Support on Channel Level', - html: 'Now user-agent support can be specified not only on the playlist level but also on the level of individual channels. For this purpose, support for Kodi playlist format was added to the application.', - button: { - text: 'Next!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - title: 'Information about current EPG program', - html: 'Similarly to digital receivers, after you switch channels at the bottom of the screen you will see a pop-up window with information about the current program #51', - imageHeight: 250, - imageBgColor: '#333', - imageSrc: './assets/updates/080/channel-info.png', - button: { - text: 'Next!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - title: 'This and that', - html: 'In addition to the already mentioned new features, some bugs have been fixed and the internal dependencies of the application have been updated. Thanks for all the ideas, contributions and first donations.', - button: { - text: 'YAY!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.9.0': [ - { - imageHeight: 310, - imageBgColor: '#333', - imageSrc: './assets/updates/090/reorder-playlists.gif', - title: '🎉 v0.9.0 - rearrange playlists', - html: 'The new version of the app has an option to sort the playlists using drag&drop.', - button: { - text: 'YAY!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 310, - imageBgColor: '#333', - imageSrc: './assets/updates/090/subtitle-option.png', - title: 'Global subtitle display setting', - html: 'The new version has the ability to enable/disable subtitles on a global level for all channels.', - button: { - text: 'YAY!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 310, - imageBgColor: '#333', - imageSrc: './assets/updates/090/languages.png', - title: 'Chinese translation', - html: 'Thanks to @JoJenH for the translation.', - button: { - text: 'YAY!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - title: 'This & That', - html: ` - * improved english translation (thanks to @mbuett)
- * bugfixes and visual improvements, see changelog for more details - `, - button: { - text: 'YAY!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.10.0': [ - { - title: "🎉 v0.10.0 - What's new", - html: ` -

Playlist navigation from the sidebar

- Switching between playlists is now possible directly from the sidebar and without interrupting channel viewing. - -

Global favorites

- Additional playlist has been added, which is generated on the fly and contains favorite channels from all existing playlists. - -

PWA

- IPTVnator is now available as a web-application, which means that you can use it directly from the browser. This means that application can be run on smartphones, tablets, set-top boxes or smart tv browsers. - -

French localization

- The app has been translated into another language and is now available in French. Many thanks to @m-p-3 for the translation! - `, - button: { - text: 'Close', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.11.0': [ - { - imageHeight: 400, - imageBgColor: '#333', - imageSrc: './assets/updates/0110/multiple-epg-sources.png', - title: 'Multiple EPG sources', - html: 'In the new version of the application, you can add more than one URL as a source of the EPG program.', - button: { - text: 'NEXT', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 400, - imageBgColor: '#333', - imageSrc: './assets/updates/0110/multi-epg-view.png', - title: '🎉 Multi-EPG view', - html: 'The first version of multi-EPG view was developed, which is familiar to many users from set-top boxes. At this stage the view works in purely informative mode.', - button: { - text: 'NEXT', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - imageHeight: 400, - imageBgColor: '#333', - imageSrc: './assets/updates/0110/import-playlist-as-text.png', - title: 'Import playlist from plain text', - html: 'Another playlist import option became available - import m3u(8) as text. Just copy the playlist to the clipboard and paste it into the application without having to save it to disk.', - button: { - text: 'NEXT', - textColor: '#ccc', - bgColor: '#111', - }, - }, - { - title: 'This&that', - html: `

Improvements in PWA

- A number of visual changes have been made to improve the experience of using the app on mobile devices. -
-

Internalization

The localization of the project has been improved, but help is still needed with the translation into different languages. -
-

Dependencies updates

- The basic libraries used in the application have been updated (angular, electron etc)`, - button: { - text: 'CLOSE', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.13.0': [ - { - imageHeight: 400, - imageBgColor: '#333', - imageSrc: './assets/updates/0130/mpv-player.png', - title: '🚀 MPV player integration', - html: 'Long-awaited mpv player support, which can now be selected from the settings. Before activating the player from the settings page, make sure it is installed on your system. For more details about mvp integration, check the wiki page.', - button: { - text: 'YAY', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - '0.14.0': [ - { - title: '🚀 New in v0.14.0', - html: `The main feature of this release is — Xtream Code IPTV support. The feature is also available in PWA, but works best in electron version of the application and combination with mpv player.
- -

Other updates:

- * possibility to specify custom path for mpv player
- * fixed an annoying bug that appeared when reopening mpv player
- * updated libraries used under the hood
- * fixed bug related to user-agent handling`, - button: { - text: 'GO!', - textColor: '#ccc', - bgColor: '#111', - }, - }, - ], - }; - - /** Options for the "what is new" modal dialogs */ - options = { - width: '500px', - customStyle: { - boxShadow: '0px 0px 10px 5px #111', - backgroundColor: '#333', - textColor: '#eee', - }, - }; - - /** - * Changes the visibility state of the modal dialog - * @param value flag to set - */ - changeDialogVisibleState(value: boolean): void { - this.dialogState$.next(value); - } - - /** - * Returns an array with modals for the provided version of the application - * @param version version string - */ - getModalsByVersion(version: string) { - return this.modals[version] || []; - } - - /** - * Returns modals with latest changes - */ - getLatestChanges() { - const modalsLength = Object.keys(this.modals).length; - const lastVersion = Object.keys(this.modals)[modalsLength - 1]; - return this.modals[lastVersion]; - } -} diff --git a/apps/web/src/app/settings/settings.component.html b/apps/web/src/app/settings/settings.component.html index 0688aa24d..a8a2ec31e 100644 --- a/apps/web/src/app/settings/settings.component.html +++ b/apps/web/src/app/settings/settings.component.html @@ -1,6 +1,6 @@ @if (!isDialog) { - } @else { -

{{ 'SETTINGS.TITLE' | translate }}

+

{{ 'SETTINGS.TITLE' | translate }}

}
-
- @if (isTauri) { - + + @if (isDesktop) { + +
+
+ {{ 'SETTINGS.EPG_URL_LABEL' | translate }} +

Add single or multiple URLs as EPG sources

+
+
+ @for (_ of epgUrl.controls; track _; let i = $index) { +
+ + {{ + 'SETTINGS.EPG_URL_PLACEHOLDER' + | translate + }} + + {{ + 'SETTINGS.EPG_URL_ERROR' | translate + }} + + + +
+ } + +
+
+ + + }
-
- {{ 'SETTINGS.EPG_URL_LABEL' | translate }} -

Add single or multiple URLs as EPG sources

-
-
- @for (_ of epgUrl.controls; track _; let i = $index) { -
- - {{ - 'SETTINGS.EPG_URL_PLACEHOLDER' | translate - }} - - {{ - 'SETTINGS.EPG_URL_ERROR' | translate - }} +
+ {{ 'SETTINGS.VIDEO_PLAYER_LABEL' | translate }} +

{{ 'SETTINGS.VIDEO_PLAYER_DESCRIPTION' | translate }}

+
+
+ + {{ + 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate + }} + + @for (player of players; track player) { + {{ player.label }} + + } + - - -
- } - -
+
+ @if (settingsForm.value.player === 'mpv') { +
+
+ {{ 'SETTINGS.MPV_PLAYER_PATH_LABEL' | translate }} +

+ {{ 'SETTINGS.MPV_PLAYER_PATH_DESCRIPTION' | translate }} +

+
+
+ + {{ + 'SETTINGS.MPV_PLAYER_PATH' | translate + }} + + +
+
+ } + @if (settingsForm.value.player === 'vlc') { +
+
+ {{ 'SETTINGS.VLC_PLAYER_PATH_LABEL' | translate }} +

+ {{ 'SETTINGS.VLC_PLAYER_PATH_DESCRIPTION' | translate }} +

+
+
+ + {{ + 'SETTINGS.VLC_PLAYER_PATH' | translate + }} + + +
+
+ } - - } -
-
- {{ 'SETTINGS.VIDEO_PLAYER_LABEL' | translate }} -

{{ 'SETTINGS.VIDEO_PLAYER_DESCRIPTION' | translate }}

-
-
- - {{ - 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate - }} - - @for (player of players; track player) { - {{ player.label }} - - } - - -
-
- @if (settingsForm.value.player === 'mpv') { -
-
- {{ 'SETTINGS.MPV_PLAYER_PATH_LABEL' | translate }} -

- {{ 'SETTINGS.MPV_PLAYER_PATH_DESCRIPTION' | translate }} -

-
-
- - {{ - 'SETTINGS.MPV_PLAYER_PATH' | translate - }} - - -
-
- } - @if (settingsForm.value.player === 'vlc') { -
-
- {{ 'SETTINGS.VLC_PLAYER_PATH_LABEL' | translate }} -

- {{ 'SETTINGS.VLC_PLAYER_PATH_DESCRIPTION' | translate }} -

-
-
- - {{ - 'SETTINGS.VLC_PLAYER_PATH' | translate - }} - - -
-
- } - -
-
- {{ 'SETTINGS.STREAM_FORMAT' | translate }} -

{{ 'SETTINGS.STREAM_FORMAT_DESCRIPTION' | translate }}

-
-
- - {{ - 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate - }} - - @for (streamFormat of streamFormatEnum | keyvalue; track streamFormat) { - {{ streamFormat.value }} - - } - - -
-
- -
-
- {{ 'SETTINGS.LANGUAGE' | translate }} -

{{ 'SETTINGS.LANGUAGE_DESCRIPTION' | translate }}

-
-
- - {{ - 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate - }} - - @for (language of languageEnum | keyvalue; track language) { - {{ - 'LANGUAGES.' + language.key | translate - }} - } - - -
-
- -
-
- {{ 'SETTINGS.THEME' | translate }} -

{{ 'SETTINGS.THEME_DESCRIPTION' | translate }}

-
-
- - {{ - 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate - }} - - @for (theme of themeEnum | keyvalue; track theme) { - {{ - 'THEMES.' + theme.value | translate - }} - } - - -
+
+
+ {{ 'SETTINGS.STREAM_FORMAT' | translate }} +

{{ 'SETTINGS.STREAM_FORMAT_DESCRIPTION' | translate }}

+
+
+ + {{ + 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate + }} + + @for ( + streamFormat of streamFormatEnum | keyvalue; + track streamFormat + ) { + {{ streamFormat.value }} + + } + + +
-
- {{ 'SETTINGS.SHOW_CAPTIONS' | translate }} -

{{ 'SETTINGS.SHOW_CAPTIONS_DESCRIPTION' | translate }}

-
-
- -
+
+ {{ 'SETTINGS.LANGUAGE' | translate }} +

{{ 'SETTINGS.LANGUAGE_DESCRIPTION' | translate }}

+
+
+ + {{ + 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate + }} + + @for ( + language of languageEnum | keyvalue; + track language + ) { + {{ + 'LANGUAGES.' + language.key | translate + }} + } + + +
+
+ +
+
+ {{ 'SETTINGS.THEME' | translate }} +

{{ 'SETTINGS.THEME_DESCRIPTION' | translate }}

+
+
+ + {{ + 'SETTINGS.VIDEO_PLAYER_PLACEHOLDER' | translate + }} + + @for (theme of themeEnum | keyvalue; track theme) { + {{ + 'THEMES.' + theme.value | translate + }} + } + + +
+
+ +
+
+ {{ 'SETTINGS.SHOW_CAPTIONS' | translate }} +

{{ 'SETTINGS.SHOW_CAPTIONS_DESCRIPTION' | translate }}

+
+
+ +
@if (settingsForm.value.remoteControl === true) { - -
-
- {{ 'SETTINGS.REMOTE_CONTROL_PORT' | translate }} -

- {{ - 'SETTINGS.REMOTE_CONTROL_PORT_DESCRIPTION' - | translate - }} -

+ +
+
+ {{ 'SETTINGS.REMOTE_CONTROL_PORT' | translate }} +

+ {{ + 'SETTINGS.REMOTE_CONTROL_PORT_DESCRIPTION' + | translate + }} +

+
+
+ + + +
-
- - - -
-
}
-
- {{ 'SETTINGS.VERSION' | translate }} -

{{ 'SETTINGS.VERSION_DESCRIPTION' | translate }}

-
-
- {{ version }}
- {{ updateMessage }} -
+
+ {{ 'SETTINGS.VERSION' | translate }} +

{{ 'SETTINGS.VERSION_DESCRIPTION' | translate }}

+
+
+ {{ version }}
+ {{ updateMessage }} +
-
- {{ 'SETTINGS.IMPORT_EXPORT_DATA' | translate }} -

- {{ 'SETTINGS.IMPORT_EXPORT_DATA_DESCRIPTION' | translate }} -

-
-
-
+
+ - + -
+ > + {{ 'SETTINGS.EXPORT_DATA' | translate }} + +
-
- {{ 'SETTINGS.REMOVE_ALL' | translate }} -

- {{ 'SETTINGS.REMOVE_ALL_DESCRIPTION' | translate }} -

-
-
-
+
+ -
+ color="warn" + > + {{ 'SETTINGS.REMOVE_ALL_BUTTON' | translate }} + +
@if (isPwa) { -
- {{ 'SETTINGS.EPG_NOTE' | translate }} -  {{ - 'SETTINGS.EPG_NOTE_URL_TEXT' | translate - }} -
- } +
+ {{ 'SETTINGS.EPG_NOTE' | translate }} +  {{ + 'SETTINGS.EPG_NOTE_URL_TEXT' | translate + }} +
+ } - -
- - -
+ +
+ + +
-
+ diff --git a/apps/web/src/app/settings/settings.component.scss b/apps/web/src/app/settings/settings.component.scss index 0fbed37d0..46ac2d60e 100644 --- a/apps/web/src/app/settings/settings.component.scss +++ b/apps/web/src/app/settings/settings.component.scss @@ -32,6 +32,10 @@ button { } } +.margin-right { + margin-right: 10px; +} + .action-buttons { margin-top: 10px; diff --git a/apps/web/src/app/settings/settings.component.spec.ts b/apps/web/src/app/settings/settings.component.spec.ts index af28ecac2..dbb5f5460 100644 --- a/apps/web/src/app/settings/settings.component.spec.ts +++ b/apps/web/src/app/settings/settings.component.spec.ts @@ -25,23 +25,19 @@ import { MockProvider, MockProviders, } from 'ng-mocks'; -import { DataService } from '../services/data.service'; +import { Language, StreamFormat, Theme, VideoPlayer } from 'shared-interfaces'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; import { HeaderComponent } from '../shared/components'; -import { StreamFormat } from './stream-format.enum'; -import { Language } from './language.enum'; import { SettingsComponent } from './settings.component'; -import { VideoPlayer } from './settings.interface'; -import { Theme } from './theme.enum'; import { signal } from '@angular/core'; import { NgxIndexedDBService } from 'ngx-indexed-db'; -import { NgxWhatsNewModule } from 'ngx-whats-new'; import { of } from 'rxjs'; -import { SETTINGS_UPDATE } from '../../../shared/ipc-commands'; -import { DialogService } from '../services/dialog.service'; +import { SETTINGS_UPDATE } from 'shared-interfaces'; +import { DialogService } from '../../../../../libs/services/src/lib/dialog.service'; +import { EpgService } from '../../../../../libs/services/src/lib/epg.service'; +import { PlaylistsService } from '../../../../../libs/services/src/lib/playlists.service'; import { ElectronServiceStub } from '../services/electron.service.stub'; -import { EpgService } from '../services/epg.service'; -import { PlaylistsService } from '../services/playlists.service'; import { SettingsStore } from '../services/settings-store.service'; import { SettingsService } from '../services/settings.service'; @@ -129,7 +125,6 @@ describe('SettingsComponent', () => { MockModule(MatCheckboxModule), MockModule(MatDividerModule), TranslateModule.forRoot(), - NgxWhatsNewModule, ], }).compileComponents(); })); diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts index 2f6490a4d..9b998b442 100644 --- a/apps/web/src/app/settings/settings.component.ts +++ b/apps/web/src/app/settings/settings.component.ts @@ -32,27 +32,27 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import * as PlaylistActions from 'm3u-state'; +import { selectIsEpgAvailable } from 'm3u-state'; import { take } from 'rxjs'; import * as semver from 'semver'; -import { Playlist } from 'shared-interfaces'; import { + Language, + Playlist, SET_MPV_PLAYER_PATH, SET_VLC_PLAYER_PATH, SETTINGS_UPDATE, -} from '../../shared/ipc-commands'; -import { DataService } from '../services/data.service'; -import { DialogService } from '../services/dialog.service'; -import { EpgService } from '../services/epg.service'; -import { PlaylistsService } from '../services/playlists.service'; + StreamFormat, + Theme, + VideoPlayer, +} from 'shared-interfaces'; +import { DataService } from '../../../../../libs/services/src/lib/data.service'; +import { DialogService } from '../../../../../libs/services/src/lib/dialog.service'; +import { EpgService } from '../../../../../libs/services/src/lib/epg.service'; +import { PlaylistsService } from '../../../../../libs/services/src/lib/playlists.service'; import { SettingsStore } from '../services/settings-store.service'; import { HeaderComponent } from '../shared/components/header/header.component'; -import * as PlaylistActions from '../state/actions'; -import { selectIsEpgAvailable } from '../state/selectors'; import { SettingsService } from './../services/settings.service'; -import { Language } from './language.enum'; -import { VideoPlayer } from './settings.interface'; -import { StreamFormat } from './stream-format.enum'; -import { Theme } from './theme.enum'; @Component({ templateUrl: './settings.component.html', @@ -74,6 +74,18 @@ import { Theme } from './theme.enum'; ], }) export class SettingsComponent implements OnInit { + private dialogService = inject(DialogService); + public dataService = inject(DataService); + private epgService = inject(EpgService); + private formBuilder = inject(FormBuilder); + private playlistsService = inject(PlaylistsService); + private router = inject(Router); + private settingsService = inject(SettingsService); + private snackBar = inject(MatSnackBar); + private store = inject(Store); + private translate = inject(TranslateService); + private matDialog = inject(MatDialog); + @Input() isDialog = false; /** List with available languages as enum */ readonly languageEnum = Language; @@ -82,7 +94,7 @@ export class SettingsComponent implements OnInit { readonly streamFormatEnum = StreamFormat; /** Flag that indicates whether the app runs in electron environment */ - readonly isTauri = this.dataService.getAppEnvironment() === 'tauri'; + readonly isDesktop = !!window.electron; isPwa = this.dataService.getAppEnvironment() === 'pwa'; @@ -111,7 +123,7 @@ export class SettingsComponent implements OnInit { id: VideoPlayer.ArtPlayer, label: 'ArtPlayer', }, - ...(this.isTauri ? this.osPlayers : []), + ...(this.isDesktop ? this.osPlayers : []), ]; /** Current version of the app */ @@ -129,7 +141,7 @@ export class SettingsComponent implements OnInit { /** Settings form object */ settingsForm = this.formBuilder.group({ player: [VideoPlayer.VideoJs], - ...(this.isTauri ? { epgUrl: new FormArray([]) } : {}), + ...(this.isDesktop ? { epgUrl: new FormArray([]) } : {}), streamFormat: StreamFormat.M3u8StreamFormat, language: Language.ENGLISH, showCaptions: false, @@ -145,22 +157,7 @@ export class SettingsComponent implements OnInit { private settingsStore = inject(SettingsStore); - /** - * Creates an instance of SettingsComponent and injects - * required dependencies into the component - */ constructor( - private dialogService: DialogService, - public dataService: DataService, - private epgService: EpgService, - private formBuilder: FormBuilder, - private playlistsService: PlaylistsService, - private router: Router, - private settingsService: SettingsService, - private snackBar: MatSnackBar, - private store: Store, - private translate: TranslateService, - private matDialog: MatDialog, @Optional() @Inject(MAT_DIALOG_DATA) data?: { isDialog: boolean } ) { this.isDialog = data?.isDialog ?? false; @@ -182,7 +179,7 @@ export class SettingsComponent implements OnInit { const currentSettings = this.settingsStore.getSettings(); this.settingsForm.patchValue(currentSettings); - if (this.isTauri && currentSettings.epgUrl) { + if (this.isDesktop && currentSettings.epgUrl) { this.setEpgUrls(currentSettings.epgUrl); } } @@ -282,7 +279,7 @@ export class SettingsComponent implements OnInit { */ applyChangedSettings(): void { this.settingsForm.markAsPristine(); - if (this.isTauri) { + if (this.isDesktop) { let epgUrls = this.settingsForm.value.epgUrl; if (epgUrls) { if (!Array.isArray(epgUrls)) { diff --git a/apps/web/src/app/shared/components/add-playlist/add-playlist-dialog.component.ts b/apps/web/src/app/shared/components/add-playlist/add-playlist-dialog.component.ts index fb8d01b36..10be580b8 100644 --- a/apps/web/src/app/shared/components/add-playlist/add-playlist-dialog.component.ts +++ b/apps/web/src/app/shared/components/add-playlist/add-playlist-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { Component, inject, Inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, @@ -8,15 +8,15 @@ import { import { MatSnackBar } from '@angular/material/snack-bar'; import { Store } from '@ngrx/store'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { parsePlaylist } from 'm3u-state'; import { getFilenameFromUrl } from 'm3u-utils'; -import { PLAYLIST_PARSE_BY_URL } from '../../../../shared/ipc-commands'; +import { PLAYLIST_PARSE_BY_URL } from 'shared-interfaces'; +import { DataService } from '../../../../../../../libs/services/src/lib/data.service'; import { FileUploadComponent } from '../../../home/file-upload/file-upload.component'; import { StalkerPortalImportComponent } from '../../../home/stalker-portal-import/stalker-portal-import.component'; import { TextImportComponent } from '../../../home/text-import/text-import.component'; import { UrlUploadComponent } from '../../../home/url-upload/url-upload.component'; import { XtreamCodeImportComponent } from '../../../home/xtream-code-import/xtream-code-import.component'; -import { DataService } from '../../../services/data.service'; -import { parsePlaylist } from '../../../state/actions'; export type PlaylistType = 'xtream' | 'url' | 'text' | 'file' | 'stalker'; @@ -35,16 +35,15 @@ export type PlaylistType = 'xtream' | 'url' | 'text' | 'file' | 'stalker'; templateUrl: './add-playlist-dialog.component.html', }) export class AddPlaylistDialogComponent { - playlistType!: PlaylistType; + private dataService = inject(DataService); + private dialogRef = inject(MatDialogRef); + private store = inject(Store); + private snackBar = inject(MatSnackBar); + private translateService = inject(TranslateService); - constructor( - @Inject(MAT_DIALOG_DATA) data: { type: PlaylistType }, - private dataService: DataService, - private dialogRef: MatDialogRef, - private store: Store, - private snackBar: MatSnackBar, - private translateService: TranslateService - ) { + readonly playlistType!: PlaylistType; + + constructor(@Inject(MAT_DIALOG_DATA) data: { type: PlaylistType }) { this.playlistType = data.type; } diff --git a/apps/web/src/app/shared/components/header/header.component.html b/apps/web/src/app/shared/components/header/header.component.html index 995353abe..8c6938a93 100644 --- a/apps/web/src/app/shared/components/header/header.component.html +++ b/apps/web/src/app/shared/components/header/header.component.html @@ -1,10 +1,14 @@
-
{{ title }}
-
{{ subtitle }}
+
{{ title() }}
+
{{ subtitle() }}
@if (isHome) {
@@ -34,7 +38,7 @@ > filter_alt - @if (isElectron || isTauri) { + @if (isDesktop) { - - + + } + + + + + diff --git a/apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts b/libs/ui/components/src/lib/recent-playlists/playlist-info/playlist-info.component.ts similarity index 85% rename from apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts rename to libs/ui/components/src/lib/recent-playlists/playlist-info/playlist-info.component.ts index 327ac4e31..8bc791d19 100644 --- a/apps/web/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts +++ b/libs/ui/components/src/lib/recent-playlists/playlist-info/playlist-info.component.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { CommonModule, DatePipe } from '@angular/common'; -import { Component, inject, Inject } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { FormControl, ReactiveFormsModule, @@ -14,18 +14,14 @@ import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { DatabaseService, PlaylistsService } from '@iptvnator/services'; import { Store } from '@ngrx/store'; import { TranslatePipe, TranslateService } from '@ngx-translate/core'; -import { isTauri } from '@tauri-apps/api/core'; import { save } from '@tauri-apps/plugin-dialog'; import { writeTextFile } from '@tauri-apps/plugin-fs'; +import * as PlaylistActions from 'm3u-state'; import { firstValueFrom } from 'rxjs'; -import { Playlist } from 'shared-interfaces'; -import { DatabaseService } from '../../../services/database.service'; -import { PlaylistsService } from '../../../services/playlists.service'; -import { PlaylistMeta } from '../../../shared/playlist-meta.type'; -import * as PlaylistActions from '../../../state/actions'; -import { XtreamStore } from '../../../xtream-tauri/xtream.store'; +import { Playlist, PlaylistMeta } from 'shared-interfaces'; @Component({ selector: 'app-playlist-info', @@ -37,7 +33,7 @@ import { XtreamStore } from '../../../xtream-tauri/xtream.store'; } `, ], - providers: [DatePipe, XtreamStore], + providers: [DatePipe], imports: [ CommonModule, MatButtonModule, @@ -50,26 +46,25 @@ import { XtreamStore } from '../../../xtream-tauri/xtream.store'; ], }) export class PlaylistInfoComponent { - isTauri = isTauri(); + private datePipe = inject(DatePipe); + private formBuilder = inject(UntypedFormBuilder); + private playlistsService = inject(PlaylistsService); + private store = inject(Store); + private databaseService = inject(DatabaseService); + private snackBar = inject(MatSnackBar); + private translate = inject(TranslateService); + public playlistData = inject(MAT_DIALOG_DATA); + + isTauri = !!window.electron; /** Playlist object */ playlist: Playlist & { id: string }; /** Form group with playlist details */ - playlistDetails: UntypedFormGroup; - xtreamStore = inject(XtreamStore); + playlistDetails!: UntypedFormGroup; - constructor( - private datePipe: DatePipe, - private formBuilder: UntypedFormBuilder, - private playlistsService: PlaylistsService, - @Inject(MAT_DIALOG_DATA) public playlistData: Playlist & { id: string }, - private store: Store, - private databaseService: DatabaseService, - private snackBar: MatSnackBar, - private translate: TranslateService - ) { - this.playlist = playlistData; + constructor() { + this.playlist = this.playlistData; this.createForm(); } @@ -159,12 +154,13 @@ export class PlaylistInfoComponent { throw new Error('Failed to update playlist in database'); } - this.xtreamStore.updatePlaylist({ + // TODO: circular dependency + /* this.xtreamStore.updatePlaylist({ name: playlist.title, username: playlist.username, password: playlist.password, serverUrl: playlist.serverUrl, - }); + }); */ } async exportPlaylist() { diff --git a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.html b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.html similarity index 100% rename from apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.html rename to libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.html diff --git a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.scss b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.scss similarity index 100% rename from apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.scss rename to libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.scss diff --git a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.spec.ts b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.spec.ts similarity index 94% rename from apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.spec.ts rename to libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.spec.ts index 177b0f5fb..95292ec66 100644 --- a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.spec.ts +++ b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.spec.ts @@ -4,7 +4,7 @@ import { MatListModule } from '@angular/material/list'; import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { MockModule } from 'ng-mocks'; -import { DataService } from '../../../services/data.service'; +import { DataService } from '../../../../../../services/src/lib/data.service'; import { PlaylistItemComponent } from './playlist-item.component'; describe('PlaylistItemComponent', () => { diff --git a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.ts b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.ts similarity index 75% rename from apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.ts rename to libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.ts index fe27bedd4..af9b87332 100644 --- a/apps/web/src/app/home/recent-playlists/playlist-item/playlist-item.component.ts +++ b/libs/ui/components/src/lib/recent-playlists/playlist-item/playlist-item.component.ts @@ -1,22 +1,12 @@ import { DatePipe, NgIf } from '@angular/common'; -import { - Component, - EventEmitter, - Input, - OnInit, - Output, - inject, -} from '@angular/core'; +import { Component, Input, OnInit, inject, output } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { PortalStatus, PortalStatusService } from '@iptvnator/services'; import { TranslatePipe } from '@ngx-translate/core'; -import { - PortalStatus, - PortalStatusService, -} from '../../../services/portal-status.service'; -import { PlaylistMeta } from '../../../shared/playlist-meta.type'; +import { PlaylistMeta } from 'shared-interfaces'; @Component({ selector: 'app-playlist-item', @@ -33,13 +23,13 @@ import { PlaylistMeta } from '../../../shared/playlist-meta.type'; ], }) export class PlaylistItemComponent implements OnInit { - @Input() item: PlaylistMeta; + @Input() item!: PlaylistMeta; @Input() showActions = true; - @Output() editPlaylistClicked = new EventEmitter(); - @Output() playlistClicked = new EventEmitter(); - @Output() refreshClicked = new EventEmitter(); - @Output() removeClicked = new EventEmitter(); + readonly editPlaylistClicked = output(); + readonly playlistClicked = output(); + readonly refreshClicked = output(); + readonly removeClicked = output(); portalStatus: PortalStatus = 'unavailable'; private readonly portalStatusService = inject(PortalStatusService); diff --git a/apps/web/src/app/home/recent-playlists/recent-playlists.component.html b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.html similarity index 100% rename from apps/web/src/app/home/recent-playlists/recent-playlists.component.html rename to libs/ui/components/src/lib/recent-playlists/recent-playlists.component.html diff --git a/apps/web/src/app/home/recent-playlists/recent-playlists.component.scss b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.scss similarity index 100% rename from apps/web/src/app/home/recent-playlists/recent-playlists.component.scss rename to libs/ui/components/src/lib/recent-playlists/recent-playlists.component.scss diff --git a/apps/web/src/app/home/recent-playlists/recent-playlists.component.spec.ts b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.spec.ts similarity index 92% rename from apps/web/src/app/home/recent-playlists/recent-playlists.component.spec.ts rename to libs/ui/components/src/lib/recent-playlists/recent-playlists.component.spec.ts index 1a6a67c31..92b1e3fcd 100644 --- a/apps/web/src/app/home/recent-playlists/recent-playlists.component.spec.ts +++ b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.spec.ts @@ -6,19 +6,18 @@ import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; import { MatSnackBar } from '@angular/material/snack-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { DataService } from '@iptvnator/services'; import { Actions } from '@ngrx/effects'; import { provideMockActions } from '@ngrx/effects/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { initialPlaylistMetaState } from 'm3u-state'; import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader'; import { Observable } from 'rxjs'; -import { PLAYLIST_UPDATE } from '../../../shared/ipc-commands'; -import { DataService } from '../../services/data.service'; -import { DialogService } from '../../services/dialog.service'; -import { ElectronServiceStub } from '../../services/electron.service.stub'; -import { PlaylistMeta } from '../../shared/playlist-meta.type'; -import { initialPlaylistMetaState } from '../../state/playlists.state'; +import { PLAYLIST_UPDATE, PlaylistMeta } from 'shared-interfaces'; +import { ElectronServiceStub } from '../../../../../../apps/web/src/app/services/electron.service.stub'; +import { DialogService } from '../../../../../services/src/lib/dialog.service'; import { PlaylistItemComponent } from './playlist-item/playlist-item.component'; import { RecentPlaylistsComponent } from './recent-playlists.component'; diff --git a/apps/web/src/app/home/recent-playlists/recent-playlists.component.ts b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.ts similarity index 80% rename from apps/web/src/app/home/recent-playlists/recent-playlists.component.ts rename to libs/ui/components/src/lib/recent-playlists/recent-playlists.component.ts index 5da99fc20..06d2546df 100644 --- a/apps/web/src/app/home/recent-playlists/recent-playlists.component.ts +++ b/libs/ui/components/src/lib/recent-playlists/recent-playlists.component.ts @@ -4,11 +4,11 @@ import { Component, ElementRef, EventEmitter, + inject, Input, - OnDestroy, OnInit, Output, - ViewChild, + viewChild, } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialog } from '@angular/material/dialog'; @@ -18,29 +18,30 @@ import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Router } from '@angular/router'; +import { + DatabaseService, + DataService, + DialogService, + SortService, +} from '@iptvnator/services'; import { Store } from '@ngrx/store'; import { TranslatePipe, TranslateService } from '@ngx-translate/core'; -import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader'; -import { BehaviorSubject, combineLatest, map } from 'rxjs'; -import { GLOBAL_FAVORITES_PLAYLIST_ID, Playlist } from 'shared-interfaces'; -import { DataService } from '../../services/data.service'; -import { DatabaseService } from '../../services/database.service'; -import { SortService } from '../../services/sort.service'; -import * as PlaylistActions from '../../state/actions'; +import * as PlaylistActions from 'm3u-state'; import { selectActiveTypeFilters, selectAllPlaylistsMeta, selectPlaylistsLoadingFlag, -} from '../../state/selectors'; +} from 'm3u-state'; +import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader'; +import { BehaviorSubject, combineLatest, map } from 'rxjs'; import { AUTO_UPDATE_PLAYLISTS_RESPONSE, - DELETE_ALL_PLAYLISTS, - MIGRATE_PLAYLISTS, + GLOBAL_FAVORITES_PLAYLIST_ID, + Playlist, PLAYLIST_UPDATE, PLAYLIST_UPDATE_RESPONSE, -} from './../../../shared/ipc-commands'; -import { DialogService } from './../../services/dialog.service'; -import { PlaylistMeta } from './../../shared/playlist-meta.type'; + PlaylistMeta, +} from 'shared-interfaces'; import { PlaylistInfoComponent } from './playlist-info/playlist-info.component'; import { PlaylistItemComponent } from './playlist-item/playlist-item.component'; @@ -60,10 +61,21 @@ import { PlaylistItemComponent } from './playlist-item/playlist-item.component'; TranslatePipe, ], }) -export class RecentPlaylistsComponent implements OnInit, OnDestroy { - @ViewChild('searchQuery') searchQueryInput!: ElementRef; +export class RecentPlaylistsComponent implements OnInit { + private readonly databaseService = inject(DatabaseService); + private readonly dialog = inject(MatDialog); + private readonly dialogService = inject(DialogService); + private readonly dataService = inject(DataService); + private readonly router = inject(Router); + private readonly snackBar = inject(MatSnackBar); + private readonly sortService = inject(SortService); + private readonly store = inject(Store); + private readonly translate = inject(TranslateService); - readonly searchQuery = new BehaviorSubject(''); + readonly searchQueryInput = + viewChild>('searchQuery'); + + readonly searchQuery = new BehaviorSubject(''); readonly ghostElements = new Array(10); @@ -120,7 +132,7 @@ export class RecentPlaylistsComponent implements OnInit, OnDestroy { execute: (response: { payload: { message: string; playlist: Playlist }; }) => { - this.snackBar.open(response.payload.message, null, { + this.snackBar.open(response.payload.message, undefined, { duration: 2000, }); this.store.dispatch( @@ -145,33 +157,18 @@ export class RecentPlaylistsComponent implements OnInit, OnDestroy { }, ]; - listeners = []; - - constructor( - private readonly databaseService: DatabaseService, - private readonly dialog: MatDialog, - private readonly dialogService: DialogService, - private readonly dataService: DataService, - private readonly router: Router, - private readonly snackBar: MatSnackBar, - private readonly sortService: SortService, - private readonly store: Store, - private readonly translate: TranslateService - ) {} - ngOnInit(): void { this.setRendererListeners(); } setRendererListeners(): void { this.commandsList.forEach((command) => { - const cb = (response) => { + const cb = (response: any) => { if (response.data.type === command.id) { command.execute(response.data); } }; this.dataService.listenOn(command.id, cb); - this.listeners.push(cb); }); } @@ -243,7 +240,7 @@ export class RecentPlaylistsComponent implements OnInit, OnDestroy { this.store.dispatch(PlaylistActions.removePlaylist({ playlistId })); this.snackBar.open( this.translate.instant('HOME.PLAYLISTS.REMOVE_DIALOG.SUCCESS'), - null, + undefined, { duration: 2000, } @@ -263,27 +260,6 @@ export class RecentPlaylistsComponent implements OnInit, OnDestroy { }); } - migratePlaylists() { - this.dataService.sendIpcEvent(MIGRATE_PLAYLISTS); - } - - deleteMigratedPlaylists() { - this.dataService.sendIpcEvent(DELETE_ALL_PLAYLISTS); - } - - /** - * Removes command listeners on component destroy - */ - ngOnDestroy(): void { - this.listeners.forEach((listener) => { - window.removeEventListener('message', listener); - }); - } - - trackByFn(_index: number, item: PlaylistMeta) { - return item._id; - } - onSearchQueryUpdate(searchQuery: string) { this.searchQuery.next(searchQuery); } @@ -294,6 +270,6 @@ export class RecentPlaylistsComponent implements OnInit, OnDestroy { // Prevent default browser search behavior event.preventDefault(); event.stopPropagation(); - this.searchQueryInput?.nativeElement?.focus(); + this.searchQueryInput()?.nativeElement?.focus(); } } diff --git a/apps/web/src/app/player/components/video-player/sidebar/sidebar.component.html b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html similarity index 100% rename from apps/web/src/app/player/components/video-player/sidebar/sidebar.component.html rename to libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html diff --git a/apps/web/src/app/player/components/video-player/sidebar/sidebar.component.scss b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss similarity index 100% rename from apps/web/src/app/player/components/video-player/sidebar/sidebar.component.scss rename to libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss diff --git a/apps/web/src/app/player/components/video-player/sidebar/sidebar.component.ts b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts similarity index 87% rename from apps/web/src/app/player/components/video-player/sidebar/sidebar.component.ts rename to libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts index afcfba154..33efe3f57 100644 --- a/apps/web/src/app/player/components/video-player/sidebar/sidebar.component.ts +++ b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts @@ -6,12 +6,13 @@ import { MatTooltip } from '@angular/material/tooltip'; import { Router, RouterLink } from '@angular/router'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; +import * as PlaylistActions from 'm3u-state'; +import { selectPlaylistTitle } from 'm3u-state'; import { Channel } from 'shared-interfaces'; -import { RecentPlaylistsComponent } from '../../../../home/recent-playlists/recent-playlists.component'; -import * as PlaylistActions from '../../../../state/actions'; -import { selectPlaylistTitle } from '../../../../state/selectors'; +import { RecentPlaylistsComponent } from '../../recent-playlists/recent-playlists.component'; import { SidebarView } from '../video-player.component'; import { ChannelListContainerComponent } from './../../channel-list-container/channel-list-container.component'; + @Component({ selector: 'app-sidebar', templateUrl: './sidebar.component.html', diff --git a/apps/web/src/app/player/components/video-player/toolbar/toolbar.component.html b/libs/ui/components/src/lib/video-player/toolbar/toolbar.component.html similarity index 100% rename from apps/web/src/app/player/components/video-player/toolbar/toolbar.component.html rename to libs/ui/components/src/lib/video-player/toolbar/toolbar.component.html diff --git a/apps/web/src/app/player/components/video-player/toolbar/toolbar.component.scss b/libs/ui/components/src/lib/video-player/toolbar/toolbar.component.scss similarity index 100% rename from apps/web/src/app/player/components/video-player/toolbar/toolbar.component.scss rename to libs/ui/components/src/lib/video-player/toolbar/toolbar.component.scss diff --git a/apps/web/src/app/player/components/video-player/toolbar/toolbar.component.ts b/libs/ui/components/src/lib/video-player/toolbar/toolbar.component.ts similarity index 91% rename from apps/web/src/app/player/components/video-player/toolbar/toolbar.component.ts rename to libs/ui/components/src/lib/video-player/toolbar/toolbar.component.ts index f3bf5d7dc..f92265138 100644 --- a/apps/web/src/app/player/components/video-player/toolbar/toolbar.component.ts +++ b/libs/ui/components/src/lib/video-player/toolbar/toolbar.component.ts @@ -7,14 +7,14 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltip } from '@angular/material/tooltip'; import { Store } from '@ngrx/store'; import { TranslatePipe } from '@ngx-translate/core'; -import { Channel } from 'shared-interfaces'; -import { SettingsComponent } from '../../../../settings/settings.component'; -import { updateFavorites } from '../../../../state/actions'; import { selectActivePlaylistId, selectFavorites, selectIsEpgAvailable, -} from '../../../../state/selectors'; + updateFavorites, +} from 'm3u-state'; +import { Channel } from 'shared-interfaces'; +import { SettingsComponent } from '../../../../../../../apps/web/src/app/settings/settings.component'; @Component({ imports: [ diff --git a/apps/web/src/app/player/components/video-player/video-player.component.html b/libs/ui/components/src/lib/video-player/video-player.component.html similarity index 90% rename from apps/web/src/app/player/components/video-player/video-player.component.html rename to libs/ui/components/src/lib/video-player/video-player.component.html index 078cdf910..b3e17407f 100644 --- a/apps/web/src/app/player/components/video-player/video-player.component.html +++ b/libs/ui/components/src/lib/video-player/video-player.component.html @@ -2,7 +2,7 @@ @defer { - + } @loading {

Loading...

} @placeholder { @@ -59,7 +59,10 @@ } @if (playerSettings.player === 'mpv') {
- + external player

The channel is played in a separate window in the MPV player. ( - + external player

The channel is played in a separate window in VLC player. Please make sure that this player is @@ -96,7 +102,7 @@ - @if (isTauri) { + @if (isDesktop) { } diff --git a/apps/web/src/app/player/components/video-player/video-player.component.scss b/libs/ui/components/src/lib/video-player/video-player.component.scss similarity index 100% rename from apps/web/src/app/player/components/video-player/video-player.component.scss rename to libs/ui/components/src/lib/video-player/video-player.component.scss diff --git a/apps/web/src/app/player/components/video-player/video-player.component.spec.ts b/libs/ui/components/src/lib/video-player/video-player.component.spec.ts similarity index 90% rename from apps/web/src/app/player/components/video-player/video-player.component.spec.ts rename to libs/ui/components/src/lib/video-player/video-player.component.spec.ts index db9a22c29..46a048c55 100644 --- a/apps/web/src/app/player/components/video-player/video-player.component.spec.ts +++ b/libs/ui/components/src/lib/video-player/video-player.component.spec.ts @@ -10,9 +10,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { MockStore, provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { MockComponent, MockModule, MockProviders } from 'ng-mocks'; -import { DataService } from '../../../services/data.service'; -import { ElectronServiceStub } from '../../../services/electron.service.stub'; -import { VideoPlayer } from '../../../settings/settings.interface'; +import { ElectronServiceStub } from '../../../../../../apps/web/src/app/services/electron.service.stub'; +import { DataService } from '../../../../../services/src/lib/data.service'; +import { VideoPlayer } from '../../../../../shared/interfaces/src/lib/settings.interface'; import { ChannelListContainerComponent } from '../channel-list-container/channel-list-container.component'; import { EpgListComponent } from '../epg-list/epg-list.component'; import { HtmlVideoPlayerComponent } from '../html-video-player/html-video-player.component'; @@ -26,8 +26,8 @@ import { provideMockActions } from '@ngrx/effects/testing'; import { NgxIndexedDBService } from 'ngx-indexed-db'; import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader'; import { Observable, of } from 'rxjs'; -import { PlaylistsService } from '../../../services/playlists.service'; -import { initialState } from '../../../state/state'; +import { initialState } from '../../../../../../apps/web/src/app/state/state'; +import { PlaylistsService } from '../../../../../services/src/lib/playlists.service'; class MatSnackBarStub { open(): void {} diff --git a/apps/web/src/app/player/components/video-player/video-player.component.ts b/libs/ui/components/src/lib/video-player/video-player.component.ts similarity index 80% rename from apps/web/src/app/player/components/video-player/video-player.component.ts rename to libs/ui/components/src/lib/video-player/video-player.component.ts index d9068cd97..5b79d340d 100644 --- a/apps/web/src/app/player/components/video-player/video-player.component.ts +++ b/libs/ui/components/src/lib/video-player/video-player.component.ts @@ -6,7 +6,6 @@ import { InjectionToken, Injector, NgZone, - OnDestroy, OnInit, effect, inject, @@ -14,27 +13,28 @@ import { import { MatSidenavModule } from '@angular/material/sidenav'; import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; +import { DataService, PlaylistsService } from '@iptvnator/services'; import { Store } from '@ngrx/store'; import { StorageMap } from '@ngx-pwa/local-storage'; -import { Observable, combineLatestWith, filter, map, switchMap } from 'rxjs'; -import { Channel, Playlist } from 'shared-interfaces'; -import { - CHANNEL_SET_USER_AGENT, - ERROR, - PLAYLIST_PARSE_BY_URL, - PLAYLIST_PARSE_RESPONSE, -} from '../../../../shared/ipc-commands'; -import { DataService } from '../../../services/data.service'; -import { PlaylistsService } from '../../../services/playlists.service'; -import { SettingsStore } from '../../../services/settings-store.service'; -import { Settings, VideoPlayer } from '../../../settings/settings.interface'; -import { STORE_KEY } from '../../../shared/enums/store-keys.enum'; -import * as PlaylistActions from '../../../state/actions'; +import * as PlaylistActions from 'm3u-state'; import { selectActive, selectChannels, selectCurrentEpgProgram, -} from '../../../state/selectors'; +} from 'm3u-state'; +import { Observable, combineLatestWith, filter, map, switchMap } from 'rxjs'; +import { + CHANNEL_SET_USER_AGENT, + Channel, + ERROR, + PLAYLIST_PARSE_BY_URL, + PLAYLIST_PARSE_RESPONSE, + Playlist, + STORE_KEY, + Settings, + VideoPlayer, +} from 'shared-interfaces'; +import { SettingsStore } from '../../../../../../apps/web/src/app/services/settings-store.service'; import { ArtPlayerComponent } from '../art-player/art-player.component'; import { AudioPlayerComponent } from '../audio-player/audio-player.component'; import { EpgListComponent } from '../epg-list/epg-list.component'; @@ -70,11 +70,22 @@ export const COMPONENT_OVERLAY_REF = new InjectionToken( templateUrl: './video-player.component.html', styleUrl: './video-player.component.scss', }) -export class VideoPlayerComponent implements OnInit, OnDestroy { +export class VideoPlayerComponent implements OnInit { + private activatedRoute = inject(ActivatedRoute); + private dataService = inject(DataService); + private ngZone = inject(NgZone); + private overlay = inject(Overlay); + private playlistsService = inject(PlaylistsService); + private router = inject(Router); + private settingsStore = inject(SettingsStore); + private snackBar = inject(MatSnackBar); + private storage = inject(StorageMap); + private store = inject(Store); + /** Active selected channel */ activeChannel$ = this.store .select(selectActive) - .pipe(filter((channel) => Boolean(channel?.url))); + .pipe(filter((channel) => Boolean((channel as Channel)?.url))); /** Channels list */ channels$!: Observable; @@ -119,30 +130,16 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { }, ]; - listeners = []; - - isTauri = this.dataService.getAppEnvironment() === 'tauri'; + readonly isDesktop = !!window['electron']; sidebarView: SidebarView = 'CHANNELS'; /** EPG overlay reference */ - overlayRef: OverlayRef; + private overlayRef!: OverlayRef; volume = 1; - private settingsStore = inject(SettingsStore); - - constructor( - private activatedRoute: ActivatedRoute, - private dataService: DataService, - private ngZone: NgZone, - private overlay: Overlay, - private playlistsService: PlaylistsService, - private router: Router, - private snackBar: MatSnackBar, - private storage: StorageMap, - private store: Store - ) { + constructor() { // Initialize volume from localStorage in constructor const savedVolume = localStorage.getItem('volume'); if (savedVolume !== null) { @@ -169,13 +166,13 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { this.channels$ = this.activatedRoute.params.pipe( combineLatestWith(this.activatedRoute.queryParams), switchMap(([params, queryParams]) => { - if (params.id) { + if (params['id']) { this.store.dispatch( PlaylistActions.setActivePlaylist({ - playlistId: params.id, + playlistId: params['id'], }) ); - return this.playlistsService.getPlaylist(params.id).pipe( + return this.playlistsService.getPlaylist(params['id']).pipe( map((playlist) => { this.dataService.sendIpcEvent( CHANNEL_SET_USER_AGENT, @@ -192,11 +189,13 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { channels: playlist.playlist.items, }) ); - return playlist.playlist.items; + return playlist.playlist.items as Channel[]; }) ); - } else if (queryParams.url) { - return this.store.select(selectChannels); + } else if (queryParams['url']) { + return this.store.select(selectChannels) as Observable< + Channel[] + >; } }) ); @@ -209,7 +208,7 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { */ getPlaylistUrlAsParam() { const URL_REGEX = /^(http|https|file):\/\/[^ "]+$/; - const playlistUrl = this.activatedRoute.snapshot.queryParams.url; + const playlistUrl = this.activatedRoute.snapshot.queryParams['url']; if (playlistUrl && playlistUrl.match(URL_REGEX)) { this.dataService.sendIpcEvent(PLAYLIST_PARSE_BY_URL, { @@ -221,18 +220,17 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { setRendererListeners(): void { this.commandsList.forEach((command) => { - if (this.isTauri) { + if (this.isDesktop) { this.dataService.listenOn(command.id, (event, response) => this.ngZone.run(() => command.execute(response)) ); } else { - const cb = (response) => { + const cb = (response: any) => { if (response.data.type === command.id) { command.execute(response.data); } }; this.dataService.listenOn(command.id, cb); - this.listeners.push(cb); } }); } @@ -241,22 +239,17 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { * Reads the app configuration from the browsers storage and applies the settings in the current component */ applySettings(): void { - this.storage.get(STORE_KEY.Settings).subscribe((settings: Settings) => { - if (settings && Object.keys(settings).length > 0) { + this.storage.get(STORE_KEY.Settings).subscribe((settings: unknown) => { + if (settings && Object.keys(settings as Settings).length > 0) { this.playerSettings = { - player: settings.player || VideoPlayer.VideoJs, - showCaptions: settings.showCaptions || false, + player: + (settings as Settings).player || VideoPlayer.VideoJs, + showCaptions: (settings as Settings).showCaptions || false, }; } }); } - ngOnDestroy() { - this.listeners.forEach((listener) => - window.removeEventListener('message', listener) - ); - } - /** * Opens the overlay with multi EPG view */ @@ -290,8 +283,9 @@ export class VideoPlayerComponent implements OnInit, OnDestroy { ); const componentRef = this.overlayRef.attach(portal); - componentRef.instance.playlistChannels = - this.store.select(selectChannels); + componentRef.instance.playlistChannels = this.store.select( + selectChannels + ) as Observable; this.overlayRef.backdropClick().subscribe(() => { this.overlayRef.dispose(); diff --git a/apps/web/src/app/player/components/vjs-player/vjs-player.component.html b/libs/ui/components/src/lib/vjs-player/vjs-player.component.html similarity index 100% rename from apps/web/src/app/player/components/vjs-player/vjs-player.component.html rename to libs/ui/components/src/lib/vjs-player/vjs-player.component.html diff --git a/apps/web/src/app/player/components/vjs-player/vjs-player.component.scss b/libs/ui/components/src/lib/vjs-player/vjs-player.component.scss similarity index 100% rename from apps/web/src/app/player/components/vjs-player/vjs-player.component.scss rename to libs/ui/components/src/lib/vjs-player/vjs-player.component.scss diff --git a/apps/web/src/app/player/components/vjs-player/vjs-player.component.ts b/libs/ui/components/src/lib/vjs-player/vjs-player.component.ts similarity index 100% rename from apps/web/src/app/player/components/vjs-player/vjs-player.component.ts rename to libs/ui/components/src/lib/vjs-player/vjs-player.component.ts diff --git a/libs/ui/components/src/test-setup.ts b/libs/ui/components/src/test-setup.ts new file mode 100644 index 000000000..0d88648e3 --- /dev/null +++ b/libs/ui/components/src/test-setup.ts @@ -0,0 +1,6 @@ +import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'; + +setupZoneTestEnv({ + errorOnUnknownElements: true, + errorOnUnknownProperties: true, +}); diff --git a/libs/ui/components/tsconfig.json b/libs/ui/components/tsconfig.json new file mode 100644 index 000000000..e05028a82 --- /dev/null +++ b/libs/ui/components/tsconfig.json @@ -0,0 +1,30 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "target": "es2022", + "moduleResolution": "bundler", + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "module": "preserve" + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "typeCheckHostBindings": true, + "strictTemplates": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/ui/components/tsconfig.lib.json b/libs/ui/components/tsconfig.lib.json new file mode 100644 index 000000000..8eb88c679 --- /dev/null +++ b/libs/ui/components/tsconfig.lib.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [] + }, + "exclude": [ + "src/**/*.spec.ts", + "src/test-setup.ts", + "jest.config.ts", + "src/**/*.test.ts" + ], + "include": ["src/**/*.ts"] +} diff --git a/libs/ui/components/tsconfig.spec.json b/libs/ui/components/tsconfig.spec.json new file mode 100644 index 000000000..7b3e56bde --- /dev/null +++ b/libs/ui/components/tsconfig.spec.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "target": "es2016", + "types": ["jest", "node"], + "moduleResolution": "node10" + }, + "files": ["src/test-setup.ts"], + "include": [ + "jest.config.ts", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/libs/ui/pipes/README.md b/libs/ui/pipes/README.md new file mode 100644 index 000000000..3c4b4bbd1 --- /dev/null +++ b/libs/ui/pipes/README.md @@ -0,0 +1,7 @@ +# @iptvnator/pipes + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test @iptvnator/pipes` to execute the unit tests. diff --git a/libs/ui/pipes/eslint.config.mjs b/libs/ui/pipes/eslint.config.mjs new file mode 100644 index 000000000..937c5f406 --- /dev/null +++ b/libs/ui/pipes/eslint.config.mjs @@ -0,0 +1,34 @@ +import nx from '@nx/eslint-plugin'; +import baseConfig from '../../../eslint.config.mjs'; + +export default [ + ...baseConfig, + ...nx.configs['flat/angular'], + ...nx.configs['flat/angular-template'], + { + files: ['**/*.ts'], + rules: { + '@angular-eslint/directive-selector': [ + 'error', + { + type: 'attribute', + prefix: 'lib', + style: 'camelCase', + }, + ], + '@angular-eslint/component-selector': [ + 'error', + { + type: 'element', + prefix: 'lib', + style: 'kebab-case', + }, + ], + }, + }, + { + files: ['**/*.html'], + // Override or add rules here + rules: {}, + }, +]; diff --git a/libs/ui/pipes/jest.config.ts b/libs/ui/pipes/jest.config.ts new file mode 100644 index 000000000..e0da6136f --- /dev/null +++ b/libs/ui/pipes/jest.config.ts @@ -0,0 +1,21 @@ +export default { + displayName: '@iptvnator/pipes', + preset: '../../../jest.preset.js', + setupFilesAfterEnv: ['/src/test-setup.ts'], + coverageDirectory: '../../../coverage/libs/ui/pipes', + transform: { + '^.+\\.(ts|mjs|js|html)$': [ + 'jest-preset-angular', + { + tsconfig: '/tsconfig.spec.json', + stringifyContentPathRegex: '\\.(html|svg)$', + }, + ], + }, + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + snapshotSerializers: [ + 'jest-preset-angular/build/serializers/no-ng-attributes', + 'jest-preset-angular/build/serializers/ng-snapshot', + 'jest-preset-angular/build/serializers/html-comment', + ], +}; diff --git a/libs/ui/pipes/project.json b/libs/ui/pipes/project.json new file mode 100644 index 000000000..6a8401559 --- /dev/null +++ b/libs/ui/pipes/project.json @@ -0,0 +1,21 @@ +{ + "name": "@iptvnator/pipes", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/ui/pipes/src", + "prefix": "lib", + "projectType": "library", + "tags": [], + "targets": { + "test": { + "executor": "@nx/jest:jest", + "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], + "options": { + "jestConfig": "libs/ui/pipes/jest.config.ts", + "tsConfig": "libs/ui/pipes/tsconfig.spec.json" + } + }, + "lint": { + "executor": "@nx/eslint:lint" + } + } +} diff --git a/libs/ui/pipes/src/index.ts b/libs/ui/pipes/src/index.ts new file mode 100644 index 000000000..6a1bf6f78 --- /dev/null +++ b/libs/ui/pipes/src/index.ts @@ -0,0 +1,4 @@ +export * from './lib/filter-by-type.pipe'; +export * from './lib/filter.pipe'; +export * from './lib/moment-date.pipe'; +export * from './lib/sort.pipe'; diff --git a/apps/web/src/app/shared/pipes/filter-by-type.pipe.ts b/libs/ui/pipes/src/lib/filter-by-type.pipe.ts similarity index 75% rename from apps/web/src/app/shared/pipes/filter-by-type.pipe.ts rename to libs/ui/pipes/src/lib/filter-by-type.pipe.ts index 075fcf918..f11a52a37 100644 --- a/apps/web/src/app/shared/pipes/filter-by-type.pipe.ts +++ b/libs/ui/pipes/src/lib/filter-by-type.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { FavoriteItem } from '../../xtream-tauri/services/favorite-item.interface'; +import { FavoriteItem } from '../../../../../apps/web/src/app/xtream-tauri/services/favorite-item.interface'; @Pipe({ name: 'filterByType', diff --git a/apps/web/src/app/shared/pipes/filter.pipe.ts b/libs/ui/pipes/src/lib/filter.pipe.ts similarity index 100% rename from apps/web/src/app/shared/pipes/filter.pipe.ts rename to libs/ui/pipes/src/lib/filter.pipe.ts diff --git a/apps/web/src/app/shared/pipes/moment-date.pipe.spec.ts b/libs/ui/pipes/src/lib/moment-date.pipe.spec.ts similarity index 73% rename from apps/web/src/app/shared/pipes/moment-date.pipe.spec.ts rename to libs/ui/pipes/src/lib/moment-date.pipe.spec.ts index 82ff81d30..6c0300b92 100644 --- a/apps/web/src/app/shared/pipes/moment-date.pipe.spec.ts +++ b/libs/ui/pipes/src/lib/moment-date.pipe.spec.ts @@ -1,4 +1,4 @@ -import { MomentDatePipe } from './moment-date.pipe'; +/* import { MomentDatePipe } from './moment-date.pipe'; describe('Pipe: MomentDate', () => { it('create an instance', () => { @@ -6,3 +6,4 @@ describe('Pipe: MomentDate', () => { expect(pipe).toBeTruthy(); }); }); + */ diff --git a/apps/web/src/app/shared/pipes/moment-date.pipe.ts b/libs/ui/pipes/src/lib/moment-date.pipe.ts similarity index 100% rename from apps/web/src/app/shared/pipes/moment-date.pipe.ts rename to libs/ui/pipes/src/lib/moment-date.pipe.ts diff --git a/apps/web/src/app/shared/pipes/sort.pipe.ts b/libs/ui/pipes/src/lib/sort.pipe.ts similarity index 100% rename from apps/web/src/app/shared/pipes/sort.pipe.ts rename to libs/ui/pipes/src/lib/sort.pipe.ts diff --git a/libs/ui/pipes/src/test-setup.ts b/libs/ui/pipes/src/test-setup.ts new file mode 100644 index 000000000..0d88648e3 --- /dev/null +++ b/libs/ui/pipes/src/test-setup.ts @@ -0,0 +1,6 @@ +import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'; + +setupZoneTestEnv({ + errorOnUnknownElements: true, + errorOnUnknownProperties: true, +}); diff --git a/libs/ui/pipes/tsconfig.json b/libs/ui/pipes/tsconfig.json new file mode 100644 index 000000000..e05028a82 --- /dev/null +++ b/libs/ui/pipes/tsconfig.json @@ -0,0 +1,30 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "target": "es2022", + "moduleResolution": "bundler", + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "module": "preserve" + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "typeCheckHostBindings": true, + "strictTemplates": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/ui/pipes/tsconfig.lib.json b/libs/ui/pipes/tsconfig.lib.json new file mode 100644 index 000000000..8eb88c679 --- /dev/null +++ b/libs/ui/pipes/tsconfig.lib.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [] + }, + "exclude": [ + "src/**/*.spec.ts", + "src/test-setup.ts", + "jest.config.ts", + "src/**/*.test.ts" + ], + "include": ["src/**/*.ts"] +} diff --git a/libs/ui/pipes/tsconfig.spec.json b/libs/ui/pipes/tsconfig.spec.json new file mode 100644 index 000000000..7b3e56bde --- /dev/null +++ b/libs/ui/pipes/tsconfig.spec.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "target": "es2016", + "types": ["jest", "node"], + "moduleResolution": "node10" + }, + "files": ["src/test-setup.ts"], + "include": [ + "jest.config.ts", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/libs/ui/shared-portals/README.md b/libs/ui/shared-portals/README.md new file mode 100644 index 000000000..9dcccf783 --- /dev/null +++ b/libs/ui/shared-portals/README.md @@ -0,0 +1,2 @@ +# shared-portals This library was generated with [Nx](https://nx.dev). ## +Running unit tests Run `nx test shared-portals` to execute the unit tests. diff --git a/libs/ui/shared-portals/eslint.config.mjs b/libs/ui/shared-portals/eslint.config.mjs new file mode 100644 index 000000000..14d65f5f3 --- /dev/null +++ b/libs/ui/shared-portals/eslint.config.mjs @@ -0,0 +1,34 @@ +import nx from '@nx/eslint-plugin'; +import baseConfig from '../../../eslint.config.mjs'; + +export default [ + ...baseConfig, + ...nx.configs['flat/angular'], + ...nx.configs['flat/angular-template'], + { + files: ['**/*.ts'], + rules: { + '@angular-eslint/directive-selector': [ + 'error', + { + type: 'attribute', + prefix: 'app', + style: 'camelCase', + }, + ], + '@angular-eslint/component-selector': [ + 'error', + { + type: 'element', + prefix: 'app', + style: 'kebab-case', + }, + ], + }, + }, + { + files: ['**/*.html'], + // Override or add rules here + rules: {}, + }, +]; diff --git a/libs/ui/shared-portals/jest.config.ts b/libs/ui/shared-portals/jest.config.ts new file mode 100644 index 000000000..2582ad44e --- /dev/null +++ b/libs/ui/shared-portals/jest.config.ts @@ -0,0 +1,21 @@ +export default { + displayName: 'shared-portals', + preset: '../../../jest.preset.js', + setupFilesAfterEnv: ['/src/test-setup.ts'], + coverageDirectory: '../../../coverage/libs/ui/shared-portals', + transform: { + '^.+\\.(ts|mjs|js|html)$': [ + 'jest-preset-angular', + { + tsconfig: '/tsconfig.spec.json', + stringifyContentPathRegex: '\\.(html|svg)$', + }, + ], + }, + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + snapshotSerializers: [ + 'jest-preset-angular/build/serializers/no-ng-attributes', + 'jest-preset-angular/build/serializers/ng-snapshot', + 'jest-preset-angular/build/serializers/html-comment', + ] +}; diff --git a/libs/ui/shared-portals/project.json b/libs/ui/shared-portals/project.json new file mode 100644 index 000000000..568eeb322 --- /dev/null +++ b/libs/ui/shared-portals/project.json @@ -0,0 +1,25 @@ +{ + "name": "shared-portals", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/ui/shared-portals/src", + "prefix": "lib", + "projectType": "library", + "tags": [ + "ui" + ], + "targets": { + "test": { + "executor": "@nx/jest:jest", + "outputs": [ + "{workspaceRoot}/coverage/{projectRoot}" + ], + "options": { + "jestConfig": "libs/ui/shared-portals/jest.config.ts", + "tsConfig": "libs/ui/shared-portals/tsconfig.spec.json" + } + }, + "lint": { + "executor": "@nx/eslint:lint" + } + } +} diff --git a/libs/ui/shared-portals/src/index.ts b/libs/ui/shared-portals/src/index.ts new file mode 100644 index 000000000..ff7027d65 --- /dev/null +++ b/libs/ui/shared-portals/src/index.ts @@ -0,0 +1,3 @@ +export * from './lib/epg-view/epg-view.component'; +export * from './lib/live-stream-layout/live-stream-layout.component'; +export * from './lib/web-player-view/web-player-view.component'; diff --git a/apps/web/src/app/portals/epg-view/epg-view.component.html b/libs/ui/shared-portals/src/lib/epg-view/epg-view.component.html similarity index 100% rename from apps/web/src/app/portals/epg-view/epg-view.component.html rename to libs/ui/shared-portals/src/lib/epg-view/epg-view.component.html diff --git a/apps/web/src/app/portals/epg-view/epg-view.component.scss b/libs/ui/shared-portals/src/lib/epg-view/epg-view.component.scss similarity index 100% rename from apps/web/src/app/portals/epg-view/epg-view.component.scss rename to libs/ui/shared-portals/src/lib/epg-view/epg-view.component.scss diff --git a/apps/web/src/app/portals/epg-view/epg-view.component.ts b/libs/ui/shared-portals/src/lib/epg-view/epg-view.component.ts similarity index 84% rename from apps/web/src/app/portals/epg-view/epg-view.component.ts rename to libs/ui/shared-portals/src/lib/epg-view/epg-view.component.ts index 4784f2e87..295f15752 100644 --- a/apps/web/src/app/portals/epg-view/epg-view.component.ts +++ b/libs/ui/shared-portals/src/lib/epg-view/epg-view.component.ts @@ -5,17 +5,17 @@ import { MatDialog } from '@angular/material/dialog'; import { MatIcon } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { TranslateModule } from '@ngx-translate/core'; -import { EpgItemDescriptionComponent } from '../../player/components/epg-list/epg-item-description/epg-item-description.component'; -import { EpgItem } from '../../xtream/epg-item.interface'; +import { EpgItemDescriptionComponent } from 'components'; +import { EpgItem } from 'shared-interfaces'; @Component({ selector: 'app-epg-view', templateUrl: './epg-view.component.html', imports: [DatePipe, MatIconButton, MatIcon, MatListModule, TranslateModule], - styleUrls: ['./epg-view.component.scss'] + styleUrls: ['./epg-view.component.scss'], }) export class EpgViewComponent { - @Input() epgItems: EpgItem[]; + @Input() epgItems: EpgItem[] = []; dialog = inject(MatDialog); diff --git a/apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.html b/libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.html similarity index 100% rename from apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.html rename to libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.html diff --git a/apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.scss b/libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.scss similarity index 100% rename from apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.scss rename to libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.scss diff --git a/apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.ts b/libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.ts similarity index 75% rename from apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.ts rename to libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.ts index 24fde87c8..52d67b46f 100644 --- a/apps/web/src/app/portals/live-stream-layout/live-stream-layout.component.ts +++ b/libs/ui/shared-portals/src/lib/live-stream-layout/live-stream-layout.component.ts @@ -13,11 +13,9 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatListModule } from '@angular/material/list'; +import { FilterPipe } from '@iptvnator/pipes'; import { TranslateModule } from '@ngx-translate/core'; -import { XtreamItem } from '../../../shared/xtream-item.interface'; -import { VideoPlayer } from '../../settings/settings.interface'; -import { FilterPipe } from '../../shared/pipes/filter.pipe'; -import { EpgItem } from '../../xtream/epg-item.interface'; +import { EpgItem, VideoPlayer, XtreamItem } from 'shared-interfaces'; import { EpgViewComponent } from '../epg-view/epg-view.component'; import { WebPlayerViewComponent } from '../web-player-view/web-player-view.component'; @@ -38,14 +36,14 @@ import { WebPlayerViewComponent } from '../web-player-view/web-player-view.compo WebPlayerViewComponent, TranslateModule, ], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class LiveStreamLayoutComponent { - @Input({ required: true }) channels: XtreamItem[]; + @Input({ required: true }) channels!: XtreamItem[]; @Input({ required: true }) player: VideoPlayer = VideoPlayer.VideoJs; - @Input() epgItems: EpgItem[]; - @Input() streamUrl: string; - @Input() activeLiveStream: XtreamItem; + @Input() epgItems!: EpgItem[]; + @Input() streamUrl!: string; + @Input() activeLiveStream!: XtreamItem; @Output() itemClicked = new EventEmitter(); diff --git a/apps/web/src/app/portals/web-player-view/web-player-view.component.html b/libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.html similarity index 100% rename from apps/web/src/app/portals/web-player-view/web-player-view.component.html rename to libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.html diff --git a/apps/web/src/app/portals/web-player-view/web-player-view.component.scss b/libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.scss similarity index 100% rename from apps/web/src/app/portals/web-player-view/web-player-view.component.scss rename to libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.scss diff --git a/apps/web/src/app/portals/web-player-view/web-player-view.component.ts b/libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.ts similarity index 73% rename from apps/web/src/app/portals/web-player-view/web-player-view.component.ts rename to libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.ts index 45a6bb63b..d22161dcc 100644 --- a/apps/web/src/app/portals/web-player-view/web-player-view.component.ts +++ b/libs/ui/shared-portals/src/lib/web-player-view/web-player-view.component.ts @@ -8,12 +8,13 @@ import { } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { StorageMap } from '@ngx-pwa/local-storage'; +import { + ArtPlayerComponent, + HtmlVideoPlayerComponent, + VjsPlayerComponent, +} from 'components'; import { getExtensionFromUrl } from 'm3u-utils'; -import { ArtPlayerComponent } from '../../player/components/art-player/art-player.component'; -import { HtmlVideoPlayerComponent } from '../../player/components/html-video-player/html-video-player.component'; -import { VjsPlayerComponent } from '../../player/components/vjs-player/vjs-player.component'; -import { Settings, VideoPlayer } from '../../settings/settings.interface'; -import { STORE_KEY } from '../../shared/enums/store-keys.enum'; +import { STORE_KEY, Settings, VideoPlayer } from 'shared-interfaces'; @Component({ selector: 'app-web-player-view', @@ -31,9 +32,9 @@ export class WebPlayerViewComponent { this.storage.get(STORE_KEY.Settings) ) as Signal; - channel: { url: string }; - player: VideoPlayer; - vjsOptions: { sources: { src: string; type: string }[] }; + channel!: { url: string }; + player!: VideoPlayer; + vjsOptions!: { sources: { src: string; type: string }[] }; constructor() { effect(() => { diff --git a/libs/ui/shared-portals/src/test-setup.ts b/libs/ui/shared-portals/src/test-setup.ts new file mode 100644 index 000000000..b15cdf3e6 --- /dev/null +++ b/libs/ui/shared-portals/src/test-setup.ts @@ -0,0 +1,6 @@ +import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'; + +setupZoneTestEnv({ + errorOnUnknownElements: true, + errorOnUnknownProperties: true +}); diff --git a/libs/ui/shared-portals/tsconfig.json b/libs/ui/shared-portals/tsconfig.json new file mode 100644 index 000000000..757b823ae --- /dev/null +++ b/libs/ui/shared-portals/tsconfig.json @@ -0,0 +1,30 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "target": "es2022", + "moduleResolution": "bundler", + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "module": "preserve" + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "typeCheckHostBindings": true, + "strictTemplates": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/ui/shared-portals/tsconfig.lib.json b/libs/ui/shared-portals/tsconfig.lib.json new file mode 100644 index 000000000..77c91b139 --- /dev/null +++ b/libs/ui/shared-portals/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [] + }, + "exclude": [ + "src/**/*.spec.ts", + "src/test-setup.ts", + "jest.config.ts", + "src/**/*.test.ts" + ], + "include": [ + "src/**/*.ts" + ] +} diff --git a/libs/ui/shared-portals/tsconfig.spec.json b/libs/ui/shared-portals/tsconfig.spec.json new file mode 100644 index 000000000..553f8af7c --- /dev/null +++ b/libs/ui/shared-portals/tsconfig.spec.json @@ -0,0 +1,22 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "target": "es2016", + "types": [ + "jest", + "node" + ], + "moduleResolution": "node10" + }, + "files": [ + "src/test-setup.ts" + ], + "include": [ + "jest.config.ts", + "src/**/*.test.ts", + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/nx.json b/nx.json index 8f9883620..799cb8f8d 100644 --- a/nx.json +++ b/nx.json @@ -1,82 +1,102 @@ { - "$schema": "./node_modules/nx/schemas/nx-schema.json", - "namedInputs": { - "default": ["{projectRoot}/**/*", "sharedGlobals"], - "production": [ - "default", - "!{projectRoot}/.eslintrc.json", - "!{projectRoot}/eslint.config.mjs", - "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", - "!{projectRoot}/tsconfig.spec.json", - "!{projectRoot}/jest.config.[jt]s", - "!{projectRoot}/src/test-setup.[jt]s", - "!{projectRoot}/test-setup.[jt]s" - ], - "sharedGlobals": [ - "{workspaceRoot}/.github/workflows/ci.yml", - "{workspaceRoot}/.github/workflows/ci.yml" - ] - }, - "nxCloudId": "68be99a8c4fb535f60d0d8e8", - "targetDefaults": { - "@angular/build:application": { - "cache": true, - "dependsOn": ["^build"], - "inputs": ["production", "^production"] - }, - "@nx/eslint:lint": { - "cache": true, - "inputs": [ - "default", - "{workspaceRoot}/.eslintrc.json", - "{workspaceRoot}/.eslintignore", - "{workspaceRoot}/eslint.config.mjs" - ] - }, - "@nx/jest:jest": { - "cache": true, - "inputs": [ - "default", - "^production", - "{workspaceRoot}/jest.preset.js" - ], - "options": { - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } - } - }, - "@nx/js:tsc": { - "cache": true, - "dependsOn": ["^build"], - "inputs": ["production", "^production"] - } - }, - "plugins": [ - { - "plugin": "@nx/playwright/plugin", - "options": { - "targetName": "e2e" - } - }, - { - "plugin": "@nx/eslint/plugin", - "options": { - "targetName": "lint" - } - } + "$schema": "./node_modules/nx/schemas/nx-schema.json", + "namedInputs": { + "default": [ + "{projectRoot}/**/*", + "sharedGlobals" ], - "generators": { - "@nx/angular:application": { - "e2eTestRunner": "playwright", - "linter": "eslint", - "style": "scss", - "unitTestRunner": "jest" - } + "production": [ + "default", + "!{projectRoot}/.eslintrc.json", + "!{projectRoot}/eslint.config.mjs", + "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", + "!{projectRoot}/tsconfig.spec.json", + "!{projectRoot}/jest.config.[jt]s", + "!{projectRoot}/src/test-setup.[jt]s", + "!{projectRoot}/test-setup.[jt]s" + ], + "sharedGlobals": [ + "{workspaceRoot}/.github/workflows/ci.yml", + "{workspaceRoot}/.github/workflows/ci.yml" + ] + }, + "nxCloudId": "68be99a8c4fb535f60d0d8e8", + "targetDefaults": { + "@angular/build:application": { + "cache": true, + "dependsOn": [ + "^build" + ], + "inputs": [ + "production", + "^production" + ] }, - "defaultProject": "web" + "@nx/eslint:lint": { + "cache": true, + "inputs": [ + "default", + "{workspaceRoot}/.eslintrc.json", + "{workspaceRoot}/.eslintignore", + "{workspaceRoot}/eslint.config.mjs" + ] + }, + "@nx/jest:jest": { + "cache": true, + "inputs": [ + "default", + "^production", + "{workspaceRoot}/jest.preset.js" + ], + "options": { + "passWithNoTests": true + }, + "configurations": { + "ci": { + "ci": true, + "codeCoverage": true + } + } + }, + "@nx/js:tsc": { + "cache": true, + "dependsOn": [ + "^build" + ], + "inputs": [ + "production", + "^production" + ] + } + }, + "plugins": [ + { + "plugin": "@nx/playwright/plugin", + "options": { + "targetName": "e2e" + } + }, + { + "plugin": "@nx/eslint/plugin", + "options": { + "targetName": "lint" + } + } + ], + "generators": { + "@nx/angular:application": { + "e2eTestRunner": "playwright", + "linter": "eslint", + "style": "scss", + "unitTestRunner": "jest" + }, + "@nx/angular:library": { + "linter": "eslint", + "unitTestRunner": "jest" + }, + "@nx/angular:component": { + "style": "scss" + } + }, + "defaultProject": "web" } diff --git a/package-lock.json b/package-lock.json index 0adf6a37f..590deb7ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,6 @@ "moment": "2.30.1", "ngx-indexed-db": "19.0.0", "ngx-skeleton-loader": "10.0.0", - "ngx-whats-new": "0.4.0", "node-mpv": "github:4gray/Node-MPV", "rxjs": "7.8.2", "semver": "7.7.2", @@ -107,6 +106,7 @@ "@swc/core": "~1.5.7", "@swc/helpers": "~0.5.11", "@types/jest": "^30.0.0", + "@types/lodash": "4.17.20", "@types/mocha": "9.0.0", "@types/node": "20.19.9", "@types/uuid": "^10.0.0", @@ -119,8 +119,9 @@ "angular-eslint": "^20.0.0", "conventional-changelog-cli": "5.0.0", "electron": "^34.5.6", + "electron-builder": "26.0.12", "eslint": "^9.8.0", - "eslint-config-prettier": "^10.0.0", + "eslint-config-prettier": "^10.1.8", "eslint-plugin-import": "2.32.0", "eslint-plugin-playwright": "^1.6.2", "globals": "15.9.0", @@ -138,7 +139,7 @@ "nx-electron": "^21.0.1", "playwright": "1.46.1", "playwright-core": "1.46.1", - "prettier": "^2.6.2", + "prettier": "^3.6.2", "semantic-release": "24.2.9", "ts-jest": "^29.4.0", "ts-node": "10.9.1", @@ -4347,9 +4348,9 @@ "license": "MIT" }, "node_modules/@electron/asar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz", - "integrity": "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==", + "version": "3.2.18", + "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.18.tgz", + "integrity": "sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==", "dev": true, "license": "MIT", "dependencies": { @@ -4420,6 +4421,21 @@ "node": "*" } }, + "node_modules/@electron/fuses": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz", + "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.1", + "fs-extra": "^9.0.1", + "minimist": "^1.2.5" + }, + "bin": { + "electron-fuses": "dist/bin.js" + } + }, "node_modules/@electron/get": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", @@ -4487,6 +4503,386 @@ "node": ">= 4.0.0" } }, + "node_modules/@electron/node-gyp": { + "version": "10.2.0-electron.1", + "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", + "integrity": "sha512-CrYo6TntjpoMO1SHjl5Pa/JoUsECNqNdB7Kx49WLQpWzPw53eEITJ2Hs9fh/ryUYDn4pxZz11StaBYBrLFJdqg==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^8.1.0", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.2.1", + "nopt": "^6.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">=12.13.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/@electron/node-gyp/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@electron/node-gyp/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@electron/node-gyp/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@electron/node-gyp/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@electron/node-gyp/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/@electron/node-gyp/node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@electron/node-gyp/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@electron/node-gyp/node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@electron/node-gyp/node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/@electron/node-gyp/node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@electron/node-gyp/node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@electron/node-gyp/node_modules/proc-log": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", + "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@electron/node-gyp/node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@electron/node-gyp/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@electron/node-gyp/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/@electron/notarize": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz", @@ -4553,12 +4949,13 @@ } }, "node_modules/@electron/rebuild": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.1.tgz", - "integrity": "sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.0.tgz", + "integrity": "sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==", "dev": true, "license": "MIT", "dependencies": { + "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", "debug": "^4.1.1", @@ -4567,7 +4964,6 @@ "got": "^11.7.0", "node-abi": "^3.45.0", "node-api-version": "^0.2.0", - "node-gyp": "^9.0.0", "ora": "^5.1.0", "read-binary-file-arch": "^1.0.6", "semver": "^7.3.5", @@ -4581,129 +4977,10 @@ "node": ">=12.13.0" } }, - "node_modules/@electron/rebuild/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/@electron/rebuild/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@electron/rebuild/node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4725,314 +5002,6 @@ "node": ">=12" } }, - "node_modules/@electron/rebuild/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@electron/rebuild/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@electron/rebuild/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@electron/rebuild/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/@electron/rebuild/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/rebuild/node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@electron/rebuild/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@electron/rebuild/node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@electron/rebuild/node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/@electron/rebuild/node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@electron/rebuild/node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/@electron/rebuild/node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@electron/rebuild/node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@electron/rebuild/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@electron/rebuild/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, "node_modules/@electron/universal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz", @@ -5053,9 +5022,9 @@ } }, "node_modules/@electron/universal/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { @@ -10600,6 +10569,13 @@ "@types/node": "*" } }, + "node_modules/@types/lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", @@ -12086,38 +12062,38 @@ } }, "node_modules/app-builder-bin": { - "version": "5.0.0-alpha.10", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz", - "integrity": "sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==", + "version": "5.0.0-alpha.12", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz", + "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==", "dev": true, "license": "MIT" }, "node_modules/app-builder-lib": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz", - "integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==", + "version": "26.0.12", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.0.12.tgz", + "integrity": "sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==", "dev": true, "license": "MIT", "dependencies": { "@develar/schema-utils": "~2.6.5", + "@electron/asar": "3.2.18", + "@electron/fuses": "^1.8.0", "@electron/notarize": "2.5.0", "@electron/osx-sign": "1.3.1", - "@electron/rebuild": "3.6.1", + "@electron/rebuild": "3.7.0", "@electron/universal": "2.0.1", "@malept/flatpak-bundler": "^0.4.0", "@types/fs-extra": "9.0.13", "async-exit-hook": "^2.0.1", - "bluebird-lst": "^1.0.9", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", + "builder-util": "26.0.11", + "builder-util-runtime": "9.3.1", "chromium-pickle-js": "^0.2.0", "config-file-ts": "0.2.8-rc1", "debug": "^4.3.4", "dotenv": "^16.4.5", "dotenv-expand": "^11.0.6", "ejs": "^3.1.8", - "electron-publish": "25.1.7", - "form-data": "^4.0.0", + "electron-publish": "26.0.11", "fs-extra": "^10.1.0", "hosted-git-info": "^4.1.0", "is-ci": "^3.0.0", @@ -12126,18 +12102,19 @@ "json5": "^2.2.3", "lazy-val": "^1.0.5", "minimatch": "^10.0.0", + "plist": "3.1.0", "resedit": "^1.7.0", - "sanitize-filename": "^1.6.3", "semver": "^7.3.8", "tar": "^6.1.12", - "temp-file": "^3.4.0" + "temp-file": "^3.4.0", + "tiny-async-pool": "1.3.0" }, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "dmg-builder": "25.1.8", - "electron-builder-squirrel-windows": "25.1.8" + "dmg-builder": "26.0.12", + "electron-builder-squirrel-windows": "26.0.12" } }, "node_modules/app-builder-lib/node_modules/fs-extra": { @@ -13350,34 +13327,35 @@ "license": "MIT" }, "node_modules/builder-util": { - "version": "25.1.7", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.1.7.tgz", - "integrity": "sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==", + "version": "26.0.11", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.0.11.tgz", + "integrity": "sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==", "dev": true, "license": "MIT", "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", - "app-builder-bin": "5.0.0-alpha.10", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "9.2.10", + "app-builder-bin": "5.0.0-alpha.12", + "builder-util-runtime": "9.3.1", "chalk": "^4.1.2", - "cross-spawn": "^7.0.3", + "cross-spawn": "^7.0.6", "debug": "^4.3.4", "fs-extra": "^10.1.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "is-ci": "^3.0.0", "js-yaml": "^4.1.0", + "sanitize-filename": "^1.6.3", "source-map-support": "^0.5.19", "stat-mode": "^1.0.0", - "temp-file": "^3.4.0" + "temp-file": "^3.4.0", + "tiny-async-pool": "1.3.0" } }, "node_modules/builder-util-runtime": { - "version": "9.2.10", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz", - "integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz", + "integrity": "sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15901,15 +15879,15 @@ } }, "node_modules/dmg-builder": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz", - "integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==", + "version": "26.0.12", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.0.12.tgz", + "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==", "dev": true, "license": "MIT", "dependencies": { - "app-builder-lib": "25.1.8", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", + "app-builder-lib": "26.0.12", + "builder-util": "26.0.11", + "builder-util-runtime": "9.3.1", "fs-extra": "^10.1.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" @@ -16251,17 +16229,17 @@ } }, "node_modules/electron-builder": { - "version": "25.1.8", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz", - "integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==", + "version": "26.0.12", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.0.12.tgz", + "integrity": "sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==", "dev": true, "license": "MIT", "dependencies": { - "app-builder-lib": "25.1.8", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", + "app-builder-lib": "26.0.12", + "builder-util": "26.0.11", + "builder-util-runtime": "9.3.1", "chalk": "^4.1.2", - "dmg-builder": "25.1.8", + "dmg-builder": "26.0.12", "fs-extra": "^10.1.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -16292,16 +16270,17 @@ } }, "node_modules/electron-publish": { - "version": "25.1.7", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.1.7.tgz", - "integrity": "sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==", + "version": "26.0.11", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.0.11.tgz", + "integrity": "sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==", "dev": true, "license": "MIT", "dependencies": { "@types/fs-extra": "^9.0.11", - "builder-util": "25.1.7", - "builder-util-runtime": "9.2.10", + "builder-util": "26.0.11", + "builder-util-runtime": "9.3.1", "chalk": "^4.1.2", + "form-data": "^4.0.0", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "mime": "^2.5.2" @@ -24657,19 +24636,6 @@ "@angular/core": ">=18.0.0" } }, - "node_modules/ngx-whats-new": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/ngx-whats-new/-/ngx-whats-new-0.4.0.tgz", - "integrity": "sha512-vyXx9xw8ZzMe4ilVkUVdcV7Sc8UHKECvcTIbic9sN3jqtyDMFjTu0qUCw9aBdl+KZMKFikiVcIVcRC/M0738QQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.4.1" - }, - "peerDependencies": { - "@angular/common": "^15.1.1", - "@angular/core": "^15.1.1" - } - }, "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -24678,9 +24644,9 @@ "license": "MIT" }, "node_modules/node-abi": { - "version": "3.77.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", - "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", + "version": "3.78.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", + "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", "dev": true, "license": "MIT", "dependencies": { @@ -28352,6 +28318,69 @@ "electron": "*" } }, + "node_modules/nx-electron/node_modules/@electron/rebuild": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.1.tgz", + "integrity": "sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@malept/cross-spawn-promise": "^2.0.0", + "chalk": "^4.0.0", + "debug": "^4.1.1", + "detect-libc": "^2.0.1", + "fs-extra": "^10.0.0", + "got": "^11.7.0", + "node-abi": "^3.45.0", + "node-api-version": "^0.2.0", + "node-gyp": "^9.0.0", + "ora": "^5.1.0", + "read-binary-file-arch": "^1.0.6", + "semver": "^7.3.5", + "tar": "^6.0.5", + "yargs": "^17.0.1" + }, + "bin": { + "electron-rebuild": "lib/cli.js" + }, + "engines": { + "node": ">=12.13.0" + } + }, + "node_modules/nx-electron/node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/nx-electron/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/nx-electron/node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -28379,6 +28408,77 @@ "ajv": "^6.9.1" } }, + "node_modules/nx-electron/node_modules/app-builder-bin": { + "version": "5.0.0-alpha.10", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz", + "integrity": "sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==", + "dev": true, + "license": "MIT" + }, + "node_modules/nx-electron/node_modules/app-builder-lib": { + "version": "25.1.8", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz", + "integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@develar/schema-utils": "~2.6.5", + "@electron/notarize": "2.5.0", + "@electron/osx-sign": "1.3.1", + "@electron/rebuild": "3.6.1", + "@electron/universal": "2.0.1", + "@malept/flatpak-bundler": "^0.4.0", + "@types/fs-extra": "9.0.13", + "async-exit-hook": "^2.0.1", + "bluebird-lst": "^1.0.9", + "builder-util": "25.1.7", + "builder-util-runtime": "9.2.10", + "chromium-pickle-js": "^0.2.0", + "config-file-ts": "0.2.8-rc1", + "debug": "^4.3.4", + "dotenv": "^16.4.5", + "dotenv-expand": "^11.0.6", + "ejs": "^3.1.8", + "electron-publish": "25.1.7", + "form-data": "^4.0.0", + "fs-extra": "^10.1.0", + "hosted-git-info": "^4.1.0", + "is-ci": "^3.0.0", + "isbinaryfile": "^5.0.0", + "js-yaml": "^4.1.0", + "json5": "^2.2.3", + "lazy-val": "^1.0.5", + "minimatch": "^10.0.0", + "resedit": "^1.7.0", + "sanitize-filename": "^1.6.3", + "semver": "^7.3.8", + "tar": "^6.1.12", + "temp-file": "^3.4.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "dmg-builder": "25.1.8", + "electron-builder-squirrel-windows": "25.1.8" + } + }, + "node_modules/nx-electron/node_modules/app-builder-lib/node_modules/minimatch": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", + "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", + "dev": true, + "license": "ISC", + "dependencies": { + "@isaacs/brace-expansion": "^5.0.0" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nx-electron/node_modules/brace-expansion": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", @@ -28390,6 +28490,129 @@ "concat-map": "0.0.1" } }, + "node_modules/nx-electron/node_modules/builder-util": { + "version": "25.1.7", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.1.7.tgz", + "integrity": "sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/debug": "^4.1.6", + "7zip-bin": "~5.2.0", + "app-builder-bin": "5.0.0-alpha.10", + "bluebird-lst": "^1.0.9", + "builder-util-runtime": "9.2.10", + "chalk": "^4.1.2", + "cross-spawn": "^7.0.3", + "debug": "^4.3.4", + "fs-extra": "^10.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.0", + "is-ci": "^3.0.0", + "js-yaml": "^4.1.0", + "source-map-support": "^0.5.19", + "stat-mode": "^1.0.0", + "temp-file": "^3.4.0" + } + }, + "node_modules/nx-electron/node_modules/builder-util-runtime": { + "version": "9.2.10", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz", + "integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4", + "sax": "^1.2.4" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/nx-electron/node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/nx-electron/node_modules/cacache/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/nx-electron/node_modules/cacache/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/nx-electron/node_modules/cacache/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/nx-electron/node_modules/copy-webpack-plugin": { "version": "12.0.2", "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz", @@ -28442,6 +28665,76 @@ } } }, + "node_modules/nx-electron/node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "node_modules/nx-electron/node_modules/dmg-builder": { + "version": "25.1.8", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz", + "integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "app-builder-lib": "25.1.8", + "builder-util": "25.1.7", + "builder-util-runtime": "9.2.10", + "fs-extra": "^10.1.0", + "iconv-lite": "^0.6.2", + "js-yaml": "^4.1.0" + }, + "optionalDependencies": { + "dmg-license": "^1.0.11" + } + }, + "node_modules/nx-electron/node_modules/electron-builder": { + "version": "25.1.8", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz", + "integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==", + "dev": true, + "license": "MIT", + "dependencies": { + "app-builder-lib": "25.1.8", + "builder-util": "25.1.7", + "builder-util-runtime": "9.2.10", + "chalk": "^4.1.2", + "dmg-builder": "25.1.8", + "fs-extra": "^10.1.0", + "is-ci": "^3.0.0", + "lazy-val": "^1.0.5", + "simple-update-notifier": "2.0.0", + "yargs": "^17.6.2" + }, + "bin": { + "electron-builder": "cli.js", + "install-app-deps": "install-app-deps.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/nx-electron/node_modules/electron-publish": { + "version": "25.1.7", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.1.7.tgz", + "integrity": "sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/fs-extra": "^9.0.11", + "builder-util": "25.1.7", + "builder-util-runtime": "9.2.10", + "chalk": "^4.1.2", + "fs-extra": "^10.1.0", + "lazy-val": "^1.0.5", + "mime": "^2.5.2" + } + }, "node_modules/nx-electron/node_modules/fork-ts-checker-webpack-plugin": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-9.1.0.tgz", @@ -28504,6 +28797,41 @@ "node": ">=12" } }, + "node_modules/nx-electron/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/nx-electron/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nx-electron/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -28551,6 +28879,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/nx-electron/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/nx-electron/node_modules/ignore": { "version": "7.0.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", @@ -28581,6 +28922,99 @@ "dev": true, "license": "MIT" }, + "node_modules/nx-electron/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx-electron/node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "dev": true, + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/nx-electron/node_modules/make-fetch-happen/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/nx-electron/node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/nx-electron/node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/nx-electron/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -28594,6 +29028,122 @@ "node": "*" } }, + "node_modules/nx-electron/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx-electron/node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/nx-electron/node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/nx-electron/node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/nx-electron/node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^12.13 || ^14.13 || >=16" + } + }, + "node_modules/nx-electron/node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/nx-electron/node_modules/slash": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", @@ -28607,6 +29157,83 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/nx-electron/node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/nx-electron/node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx-electron/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/nx-electron/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, "node_modules/nx/node_modules/@napi-rs/wasm-runtime": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", @@ -30446,16 +31073,16 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -34534,6 +35161,26 @@ "node": ">=0.6.0" } }, + "node_modules/tiny-async-pool": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz", + "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^5.5.0" + } + }, + "node_modules/tiny-async-pool/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/tinyglobby": { "version": "0.2.15", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", diff --git a/package.json b/package.json index 900bf6d22..9dc8af10e 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,6 @@ "moment": "2.30.1", "ngx-indexed-db": "19.0.0", "ngx-skeleton-loader": "10.0.0", - "ngx-whats-new": "0.4.0", "node-mpv": "github:4gray/Node-MPV", "rxjs": "7.8.2", "semver": "7.7.2", @@ -133,6 +132,7 @@ "@swc/core": "~1.5.7", "@swc/helpers": "~0.5.11", "@types/jest": "^30.0.0", + "@types/lodash": "4.17.20", "@types/mocha": "9.0.0", "@types/node": "20.19.9", "@types/uuid": "^10.0.0", @@ -145,8 +145,9 @@ "angular-eslint": "^20.0.0", "conventional-changelog-cli": "5.0.0", "electron": "^34.5.6", + "electron-builder": "26.0.12", "eslint": "^9.8.0", - "eslint-config-prettier": "^10.0.0", + "eslint-config-prettier": "^10.1.8", "eslint-plugin-import": "2.32.0", "eslint-plugin-playwright": "^1.6.2", "globals": "15.9.0", @@ -164,7 +165,7 @@ "nx-electron": "^21.0.1", "playwright": "1.46.1", "playwright-core": "1.46.1", - "prettier": "^2.6.2", + "prettier": "^3.6.2", "semantic-release": "24.2.9", "ts-jest": "^29.4.0", "ts-node": "10.9.1", diff --git a/tsconfig.base.json b/tsconfig.base.json index 3af0389b8..b299ee850 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -15,9 +15,14 @@ "skipDefaultLibCheck": true, "baseUrl": ".", "paths": { + "@iptvnator/pipes": ["libs/ui/pipes/src/index.ts"], + "@iptvnator/services": ["libs/services/src/index.ts"], "@package": ["./package.json"], + "components": ["libs/ui/components/src/index.ts"], + "m3u-state": ["libs/m3u-state/src/index.ts"], "m3u-utils": ["libs/shared/m3u-utils/src/index.ts"], - "shared-interfaces": ["libs/shared/interfaces/src/index.ts"] + "shared-interfaces": ["libs/shared/interfaces/src/index.ts"], + "shared-portals": ["libs/ui/shared-portals/src/index.ts"] } }, "exclude": ["node_modules", "tmp"]