@owdproject/core 3.0.0-alpha.1 → 3.0.0-alpha.3

package/index.ts

@@ -1,10 +1,155 @@
+import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule} from '@nuxt/kit'
+import pkg from '../package.json'
+
+export default defineNuxtModule({
+    meta: {
+        name: 'owd-core',
+    },
+    async setup(options, nuxt) {
+        const {resolve} = createResolver(import.meta.url);
+
+        // set core version to runtime variables
+
+        nuxt.options.runtimeConfig.public.coreVersion = pkg.version
+
+        // configure nuxt plugins
+
+        nuxt.options.primevue = nuxt.options.primevue || {};
+        nuxt.options.primevue.options = nuxt.options.primevue.options || {};
+        nuxt.options.primevue.options.theme = nuxt.options.primevue.options.theme || {};
+
+        {
+
+            // install tailwind
+
+            nuxt.options.modules.push('@nuxtjs/tailwindcss')
+            await installModule("@nuxtjs/tailwindcss", {
+                viewer: false,
+            })
+
+        }
+
+        {
+
+            // install primevue
+
+            nuxt.options.modules.push('@primevue/nuxt-module')
+            await installModule("@primevue/nuxt-module")
+
+        }
+
+        {
+
+            // install pinia
+
+            nuxt.options.modules.push('@pinia/nuxt')
+            await installModule("@pinia/nuxt")
+
+        }
+
+        {
+
+            // install @nuxt/fonts
+
+            nuxt.options.modules.push('@nuxt/fonts')
+            await installModule("@nuxt/fonts")
+
+        }
+
+        {
+
+            // install @nuxt/icon
+
+            nuxt.options.modules.push('@nuxt/icon')
+            await installModule("@nuxt/icon", {
+                clientBundle: {
+                    scan: true,
+                    sizeLimitKb: 256,
+                },
+            })
+
+        }
+
+        {
+
+            // install @vueuse/nuxt
+
+            nuxt.options.modules.push('@vueuse/nuxt')
+            await installModule("@vueuse/nuxt")
+
+        }
+
+        {
+
+            // install @nuxtjs/i18n
+
+            nuxt.options.modules.push('@nuxtjs/i18n')
+            await installModule("@nuxtjs/i18n")
+
+        }
+
+        {
+
+            // configure scss for vite
+
+            nuxt.hook('vite:extendConfig', (viteConfig) => {
+                viteConfig.css = viteConfig.css || {}
+                viteConfig.css.preprocessorOptions = viteConfig.css.preprocessorOptions || {}
+                viteConfig.css.preprocessorOptions.scss = {
+                    api: 'modern-compiler',
+                }
+            })
+
+        }
+
+        {
+
+            // add css
+
+            nuxt.options.css.push('sanitize.css')
+
+        }
+
+        {
+
+            // add runtime components
+
+            addComponentsDir({
+                path: resolve("./runtime/components"),
+                prefix: "",
+                global: true,
+            })
+
+        }
+
+        {
+
+            nuxt.options.plugins.push(
+                resolve('./runtime/plugins/resize.client.ts'),
+            )
+
+            addImportsDir(resolve('./runtime/composables'))
+            addImportsDir(resolve('./runtime/core'))
+            addImportsDir(resolve('./runtime/stores'))
+            addImportsDir(resolve('./runtime/utils'))
+
+        }
+
+    }
+})
+
 export * from './runtime/composables/useAppEntries'
 export * from './runtime/composables/useApplicationManager'
 export * from './runtime/composables/useApplicationState'
 export * from './runtime/composables/useDesktopManager'
 export * from './runtime/composables/useTerminalManager'
+export * from './runtime/utils/utilsApp'
 export * from './runtime/utils/utilsCommon'
 export * from './runtime/utils/utilsDebug'
 export * from './runtime/utils/utilsDesktop'
 export * from './runtime/utils/utilsTerminal'
-export * from './runtime/utils/utilsWindow'
+export * from './runtime/utils/utilsWindow'
+export * from './runtime/stores/storeDesktop'
+export * from './runtime/stores/storeDesktopVolume'
+export * from './runtime/stores/storeDesktopWindow'
+export * from './runtime/stores/storeDesktopWorkspace'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.3",
   "description": "Open Web Desktop core",
   "keywords": [
     "web",

package/runtime/components/Core/Background/CoreBackground.vue

@@ -12,6 +12,5 @@
   right: 0;
   bottom: 0;
   background-color: var(--owd-background-color);
-  z-index: -1;
 }
 </style>

package/runtime/components/Core/Window/CoreWindow.vue

@@ -116,7 +116,6 @@ const classes = computed(() => {
       :class="classes"
       :width="windowController?.state.size?.width"
       :height="windowController?.state.size?.height"
-      :min-width="windowController?.state.size?.minWidth"
       :min-height="windowController?.state.size?.minHeight"
       :max-width="windowController?.state.size?.maxWidth"
       :max-height="windowController?.state.size?.maxHeight"

package/runtime/components/Core/Window/CoreWindowContent.vue

@@ -12,7 +12,7 @@ const classes = computed(() => {
   }
 
   if (windowContent?.padded) {
-    list.push('p-2')
+    list.push('owd-window__content--padded')
   }
 
   return list

package/runtime/composables/useAppEntries.ts

@@ -1,21 +1,36 @@
 import {useApplicationManager} from './useApplicationManager'
 import {computed} from "@vue/reactivity"
 
+type SortBy = 'title' | 'category' | ((a: ApplicationEntryWithInherited, b: ApplicationEntryWithInherited) => number)
+type Visibility = 'primary' | 'all' | ((entry: ApplicationEntryWithInherited) => boolean)
+
 export function useAppEntries() {
     const applicationManager = useApplicationManager()
 
-    const sortedAppEntries = function(sortBy: 'title'): Ref<ApplicationEntryWithInherited[]> {
+    const sortedAppEntries = function(
+        sortBy: SortBy = 'title',
+        visibility: Visibility = 'primary'
+    ): Ref<ApplicationEntryWithInherited[]> {
         return computed(() => {
             const currentEntries = [...applicationManager.appsEntries]
 
-            if (sortBy === 'title') {
-                currentEntries.sort((a, b) => (a.title || '').localeCompare(b.title || ''))
-            } else if (sortBy === 'category') {
-                currentEntries.sort((a, b) => (a.category || '').localeCompare(b.category || ''))
-            }
-            return currentEntries
+            // filtering
+            const filtered = typeof visibility === 'function'
+                ? currentEntries.filter(visibility)
+                : visibility === 'primary'
+                    ? currentEntries.filter(e => e.visibility !== 'secondary')
+                    : currentEntries
+
+            // sorting
+            const sorted = typeof sortBy === 'function'
+                ? filtered.sort(sortBy)
+                : sortBy === 'title'
+                    ? filtered.sort((a, b) => (a.title || '').localeCompare(b.title || ''))
+                    : filtered.sort((a, b) => (a.category || '').localeCompare(b.category || ''))
+
+            return sorted
         })
     }
 
     return { sortedAppEntries }
-}
+}

package/runtime/core/controllers/ApplicationController.ts

@@ -189,7 +189,6 @@ export class ApplicationController implements IApplicationController {
     // meta
 
     get meta() {
-        console.log('META', this.id, this.store.meta)
         return this.store.meta
     }
 
@@ -203,7 +202,7 @@ export class ApplicationController implements IApplicationController {
 
     // commands
 
-    async execCommand(input: string): Promise<CommandOutput | void> {
-        await this.applicationManager.execAppCommand(this.id, input)
+    async execCommand(command: string): Promise<CommandOutput | void> {
+        await this.applicationManager.execAppCommand(this.id, command)
     }
 }

package/runtime/core/managers/ApplicationManager.ts

@@ -1,6 +1,7 @@
 import type {Reactive} from "@vue/reactivity"
 import {reactive, markRaw} from "@vue/reactivity"
 import {ApplicationController} from "../controllers/ApplicationController";
+import {normalizeApplicationConfig} from "../../utils/utilsApp"
 import {debugLog} from "../../utils/utilsDebug"
 
 export class ApplicationManager implements IApplicationManager {
@@ -34,18 +35,12 @@ export class ApplicationManager implements IApplicationManager {
             return this.apps.get(id)!;
         }
 
-        if (!config.version) config.version = 'unknown'
-        if (!config.description) config.description = ''
-        if (!config.category) config.category = 'other'
-
-        const applicationConfig = markRaw(config)
+        const normalizedConfig = normalizeApplicationConfig(config)
+        const applicationConfig = markRaw(normalizedConfig)
 
         const applicationController: IApplicationController = new ApplicationController(id, applicationConfig)
-
-        // finalize application setup doing other async operations
         await applicationController.initApplication()
 
-        // define application
         this.apps.set(id, applicationController)
 
         return applicationController
@@ -98,8 +93,6 @@ export class ApplicationManager implements IApplicationManager {
 
         const entry: ApplicationEntry = applicationController.config.entries[entryKey]!
 
-        console.log('dio cane', entry)
-
         await this.execAppCommand(applicationController.id, entry.command)
     }
 
@@ -116,17 +109,16 @@ export class ApplicationManager implements IApplicationManager {
 
         const applicationController: IApplicationController = this.apps.get(id)!
 
-        if (applicationController.config.commands && !applicationController.config.commands.hasOwnProperty(command)) {
+        const commandSplit: string[] = command.split(" ")
+        const baseCommand = commandSplit[0] as keyof typeof applicationController.config.commands
+
+        if (applicationController.config.commands && !applicationController.config.commands.hasOwnProperty(baseCommand)) {
             throw Error(`App command "${command}" is not defined in ${id} application`);
         }
 
-        const commandSplit: string[] = command.split(" ")
-
-        const commandFn: any = applicationController.config.commands![
-            commandSplit[0] as keyof typeof applicationController.config.commands
-            ]
+        const commandFn: any = applicationController.config.commands![baseCommand]
 
-        commandFn(applicationController, commandSplit.shift())
+        commandFn(applicationController, commandSplit.slice(1))
 
         applicationController.setRunning(true)
 
@@ -168,6 +160,7 @@ export class ApplicationManager implements IApplicationManager {
                     title: entry.title !== undefined ? entry.title : applicationController.config.title,
                     icon: entry.icon !== undefined ? entry.icon : applicationController.config.icon,
                     category: entry.category !== undefined ? entry.category : applicationController.config.category,
+                    visibility: entry.visibility,
                     command: entry.command
                 })
             }

package/runtime/stores/storeDesktopVolume.ts

@@ -12,6 +12,7 @@ export const useDesktopVolumeStore = defineStore('owd/desktop/volume', () => {
     }
 
     return {
-        master
+        master,
+        setMasterVolume
     }
 })

package/runtime/utils/utilsApp.ts

@@ -0,0 +1,21 @@
+export function normalizeApplicationConfig(config: ApplicationConfig): ApplicationConfig {
+    const normalizedEntries: Record<string, ApplicationEntry> = {}
+
+    for (const [key, entry] of Object.entries(config.entries)) {
+        normalizedEntries[key] = {
+            ...entry,
+            title: entry.title ?? config.title,
+            icon: entry.icon ?? config.icon,
+            category: entry.category ?? config.category,
+            visibility: entry.visibility ?? 'primary',
+        }
+    }
+
+    return {
+        ...config,
+        version: config.version ?? 'unknown',
+        description: config.description ?? '',
+        category: config.category ?? 'other',
+        entries: normalizedEntries,
+    }
+}

package/types/owd.d.ts

@@ -1,20 +1,27 @@
 interface IApplicationManager {
     apps: Map<string, IApplicationController>
-    appsRunning: Reactive<IApplicationController>
 
     importApps()
 
     get appsEntries(): Reactive<ApplicationEntry[]>
-    get windowsOpened(): Reactive<IWindowController>
+
+    get appsRunning(): Reactive<IApplicationController[]>
+
+    get windowsOpened(): Reactive<IWindowController[]>
+
     get appCategories(): string[]
+
     get appsByCategory(): { [category: string]: IApplicationController[] }
 
     defineApp(appId: string, config: ApplicationConfig): Promise<IApplicationController>
+
     closeApp(id: string): void
 
+    launchAppEntry(appId: string, entry: string): Promise<IApplicationController | undefined>
     execAppCommand(appId: string, command: string): Promise<IApplicationController | undefined>
 
     isAppDefined(id: string): boolean
+
     isAppRunning(id: string): boolean
 }
 
@@ -36,8 +43,11 @@ interface ApplicationConfig {
     commands?: { [key: string]: ApplicationCommand }
 
     onReady?(app: IApplicationController): void | Promise<void>
+
     onLaunch?(app: IApplicationController): void | Promise<void>
+
     onRestore?(app: IApplicationController): void | Promise<void>
+
     onClose?(app: IApplicationController): void | Promise<void>
 }
 
@@ -48,17 +58,21 @@ interface ApplicationConfigProvide {
 
 type IApplicationMeta = { [key: string]: any }
 
-interface IApplicationController {
+interface sIApplicationController {
     id: string
     config: ApplicationConfig
+
     get meta(): { [key: string]: any }
+
     store: Pinia
     windows: Reactive<Map<string, IWindowController>>
 
     isRunning: boolean
+
     setRunning(value: boolean): void
 
     initApplication(): Promise<void>
+
     restoreApplication(): Promise<boolean>
 
     openWindow(model: string, windowStoredState?: WindowStoredState, meta?: {
@@ -66,8 +80,11 @@ interface IApplicationController {
     })
 
     closeWindow(windowId: string): void
+
     closeAllWindows(): void
 
+    execCommand(command: string)
+
     get windowsOpened(): Reactive<Map<string, IWindowController>>
 }
 
@@ -78,11 +95,13 @@ interface IWindowController {
 
     config: WindowConfig
     override: WindowOverride
+
     get state(): WindowState
 
     // common
     get title(): string
-    get icon(): string|undefined
+
+    get icon(): string | undefined
 
     // sizes
     get width(): WindowSizeValue
@@ -139,7 +158,7 @@ interface IWindowController {
         setWorkspace(workspaceId: string)
 
         // override
-        setTitleOverride(title: string|undefined): void
+        setTitleOverride(title: string | undefined): void
         resetTitleOverride(): void
     }
 }
@@ -186,8 +205,8 @@ interface WindowStoredState {
 }
 
 interface WindowOverride {
-    title?: undefined|string
-    icon?: undefined|string
+    title?: undefined | string
+    icon?: undefined | string
 }
 
 interface WindowState {
@@ -240,25 +259,31 @@ interface WindowPosition {
     z?: number
 }
 
-type WindowSizeValue = number|string|undefined
+type WindowSizeValue = number | string | undefined
 
 interface ApplicationEntry {
     title?: string
     icon?: string
     category?: string
+    visibility?: ApplicationEntryVisibility
     command: string | any
 }
 
+
 interface ApplicationEntryWithInherited extends ApplicationEntry {
     application: IApplicationController
+    visibility: ApplicationEntryVisibility
 }
 
+type ApplicationEntryVisibility = 'primary' | 'secondary' | 'hidden'
+
 // DESKTOP
 
 interface IDesktopManager {
     defaultApps: DefaultAppsConfig
 
     getDefaultApp(feature: string)
+
     setDefaultApp(feature: string, application: IApplicationController, entry: ApplicationEntry)
 }
 
@@ -304,6 +329,7 @@ interface DefaultAppsConfig {
     terminal?: DefaultAppConfig
     browser?: DefaultAppConfig
     editor?: DefaultAppConfig
+
     [key: string]: DefaultAppConfig
 }
 

package/module/index.ts

@@ -1,144 +0,0 @@
-import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule} from '@nuxt/kit'
-import pkg from '../package.json'
-import path from "path";
-
-export default defineNuxtModule({
-    meta: {
-        name: 'owd-core',
-    },
-    async setup(options, nuxt) {
-        const {resolve} = createResolver(import.meta.url);
-
-        // set core version to runtime variables
-
-        nuxt.options.runtimeConfig.public.coreVersion = pkg.version
-
-        // configure nuxt plugins
-
-        nuxt.options.primevue = nuxt.options.primevue || {};
-        nuxt.options.primevue.options = nuxt.options.primevue.options || {};
-        nuxt.options.primevue.options.theme = nuxt.options.primevue.options.theme || {};
-        nuxt.options.primevue.options.theme.options = {
-            cssLayer: false
-        };
-
-        {
-
-            // install tailwind
-
-            nuxt.options.modules.push('@nuxtjs/tailwindcss')
-            await installModule("@nuxtjs/tailwindcss", {
-                viewer: false,
-                //configPath: resolve(runtimeDir, "tailwind.config"),
-            })
-
-        }
-
-        {
-
-            // install primevue
-
-            nuxt.options.modules.push('@primevue/nuxt-module')
-            await installModule("@primevue/nuxt-module")
-
-        }
-
-        {
-
-            // install pinia
-
-            nuxt.options.modules.push('@pinia/nuxt')
-            await installModule("@pinia/nuxt")
-
-        }
-
-        {
-
-            // install @nuxt/fonts
-
-            nuxt.options.modules.push('@nuxt/fonts')
-            await installModule("@nuxt/fonts")
-
-        }
-
-        {
-
-            // install @nuxt/icon
-
-            nuxt.options.modules.push('@nuxt/icon')
-            await installModule("@nuxt/icon", {
-                clientBundle: {
-                    scan: true,
-                    sizeLimitKb: 256,
-                },
-            })
-
-        }
-
-        {
-
-            // install @vueuse/nuxt
-
-            nuxt.options.modules.push('@vueuse/nuxt')
-            await installModule("@vueuse/nuxt")
-
-        }
-
-        {
-
-            // install @nuxtjs/i18n
-
-            nuxt.options.modules.push('@nuxtjs/i18n')
-            await installModule("@nuxtjs/i18n")
-
-        }
-
-        {
-
-            // configure scss for vite
-
-            nuxt.hook('vite:extendConfig', (viteConfig) => {
-                viteConfig.css = viteConfig.css || {}
-                viteConfig.css.preprocessorOptions = viteConfig.css.preprocessorOptions || {}
-                viteConfig.css.preprocessorOptions.scss = {
-                    api: 'modern-compiler',
-                }
-            })
-
-        }
-
-        {
-
-            // add css
-
-            nuxt.options.css.push('sanitize.css')
-
-        }
-
-        {
-
-            // add runtime components
-
-            addComponentsDir({
-                path: resolve("../runtime/components"),
-                prefix: "",
-                global: true,
-            })
-
-        }
-
-        {
-
-            nuxt.options.plugins.push(
-                resolve('../runtime/plugins/resize.client.ts'),
-            )
-
-            addImportsDir(resolve('../runtime/composables'))
-            addImportsDir(resolve('../runtime/core'))
-            addImportsDir(resolve('../runtime/stores'))
-            addImportsDir(resolve('../runtime/utils'))
-
-        }
-
-    }
-})