@vnejs/core 0.2.14 → 0.2.16

package/dist/index.d.ts

@@ -1,8 +1,10 @@
+import "@vnejs/plugins.core.storage.contract";
+import "@vnejs/plugins.core.system.contract";
 import { Observer } from "@vnejs/observer";
 import { type ModuleGlobalStateRegistry } from "@vnejs/module";
 import type { VneModuleClass } from "@vnejs/shared";
 import type { ModuleShared, VneCoreModules } from "./types.js";
-export type { ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
+export type { ModInfo, ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
 export declare class VneCore {
     observer: Observer;
     modules: VneCoreModules;

package/dist/index.js

@@ -1,3 +1,5 @@
+import "@vnejs/plugins.core.storage.contract";
+import "@vnejs/plugins.core.system.contract";
 import { Observer } from "@vnejs/observer";
 import { VNE, VNE_MODULES } from "@vnejs/shared";
 import { toJson } from "@vnejs/helpers";
@@ -14,7 +16,9 @@ export class VneCore {
         const CONST = VNE.CONST;
         const ts = Math.round(new Date().getTime() / 1000 / 60 / 60);
         const mods = (await fetch(`${CONST.SYSTEM.HOST}/mods.json?ts=${ts}`).then(toJson));
-        const fetchResult = await Promise.all(mods.map((mod) => fetch(`${CONST.SYSTEM.HOST}/media.${mod}.json?ts=${ts}`).then(toJson)));
+        const fetchResult = await Promise.all(Object.entries(mods)
+            .filter(([, mod]) => mod.hasMediaDir)
+            .map(([mod]) => fetch(`${CONST.SYSTEM.HOST}/media.${mod}.json?ts=${ts}`).then(toJson)));
         const media = fetchResult.reduce(mergeFetchResult, {});
         const injectArg = { observer: this.observer, state: this.state, shared: this.shared, media };
         Object.values(this.modules).forEach((module) => {
@@ -36,14 +40,13 @@ export class VneCore {
             window.uninitedModules = window.uninitedModules.filter((k) => k !== module.name);
         }));
         console.log("init modules finish");
-        const started = VNE.EVENTS.SYSTEM?.STARTED;
-        if (started)
-            await this.observer.emit(started);
+        const { STARTED } = VNE.EVENTS.SYSTEM;
+        await this.observer.emit(STARTED);
     };
     reset = async () => {
-        const EVENTS = VNE.EVENTS;
-        await this.observer.emit(EVENTS.STORAGE.CLEAR);
-        await this.observer.emit(EVENTS.SYSTEM.RELOAD);
+        const { STORAGE, SYSTEM } = VNE.EVENTS;
+        await this.observer.emit(STORAGE.CLEAR);
+        await this.observer.emit(SYSTEM.RELOAD);
     };
     addModule = (ModuleClass) => {
         const module = new ModuleClass();

package/dist/types.d.ts

@@ -1,23 +1,17 @@
 import type { Module, ModuleMedia, ModuleShared } from "@vnejs/module";
+import type { VnePluginConstantsMapRegistry, VnePluginEventsMapRegistry } from "@vnejs/shared";
+import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscribeEvents } from "@vnejs/plugins.core.storage.contract";
+import type { Constants as SystemConstants, PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/plugins.core.system.contract";
 export type VneCoreModules = Record<string, Module | undefined>;
 export type { ModuleMedia, ModuleShared };
+export type ModInfo = Record<string, unknown> & {
+    hasMediaDir: boolean;
+    hasPublicDir: boolean;
+};
+export type CorePluginConstants = VnePluginConstantsMapRegistry & Record<SystemPluginName, SystemConstants>;
+export type CorePluginEvents = VnePluginEventsMapRegistry & Record<SystemPluginName, SystemSubscribeEvents> & Record<StoragePluginName, StorageSubscribeEvents>;
 declare global {
     interface Window {
         uninitedModules: string[];
     }
 }
-export interface CoreVnePluginEventsMap {
-    STORAGE: {
-        CLEAR: string;
-    };
-    SYSTEM: {
-        RELOAD: string;
-        STARTED: string;
-        HOST: string;
-    };
-}
-export interface CoreVnePluginConstantsMap {
-    SYSTEM: {
-        HOST: string;
-    };
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/core",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,15 +26,17 @@
     "@capacitor/splash-screen": "5.0.8",
     "@capacitor/assets": "3.0.5",
     "@capacitor/cli": "5.0.2",
-    "@vnejs/constants": "~0.0.1",
-    "@vnejs/shared": "~0.0.8",
-    "@vnejs/semaphore": "~0.0.1",
-    "@vnejs/build": "~0.0.19",
-    "@vnejs/desktop": "~0.0.29",
+    "@vnejs/constants": "~0.1.0",
+    "@vnejs/shared": "~0.1.0",
+    "@vnejs/semaphore": "~0.1.0",
+    "@vnejs/build": "~0.0.1",
+    "@vnejs/desktop": "~0.0.1",
     "@vnejs/module": "~0.0.1",
     "@vnejs/module.components": "~0.0.1",
-    "@vnejs/observer": "~0.0.1",
-    "@vnejs/helpers": "~0.1.0"
+    "@vnejs/observer": "~0.1.0",
+    "@vnejs/helpers": "~0.1.0",
+    "@vnejs/plugins.core.storage.contract": "~0.0.1",
+    "@vnejs/plugins.core.system.contract": "~0.0.1"
   },
   "devDependencies": {
     "@vnejs/configs.ts-common": "~0.0.1"

package/src/index.ts

@@ -1,13 +1,16 @@
+import "@vnejs/plugins.core.storage.contract";
+import "@vnejs/plugins.core.system.contract";
+
 import { Observer } from "@vnejs/observer";
 import { Module, type ModuleGlobalStateRegistry, type ModuleInject } from "@vnejs/module";
 import { VNE, VNE_MODULES } from "@vnejs/shared";
 import type { VneModuleClass } from "@vnejs/shared";
 import { toJson } from "@vnejs/helpers";
 
-import type { CoreVnePluginConstantsMap, CoreVnePluginEventsMap, ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
+import type { CorePluginConstants, CorePluginEvents, ModInfo, ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
 import { mergeFetchResult } from "./utils.js";
 
-export type { ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
+export type { ModInfo, ModuleMedia, ModuleShared, VneCoreModules } from "./types.js";
 
 export class VneCore {
   observer = new Observer();
@@ -20,11 +23,15 @@ export class VneCore {
   }
 
   init = async () => {
-    const CONST = VNE.CONST as unknown as CoreVnePluginConstantsMap;
+    const CONST = VNE.CONST as CorePluginConstants;
     const ts = Math.round(new Date().getTime() / 1000 / 60 / 60);
 
-    const mods = (await fetch(`${CONST.SYSTEM.HOST}/mods.json?ts=${ts}`).then(toJson)) as string[];
-    const fetchResult = await Promise.all(mods.map((mod) => fetch(`${CONST.SYSTEM.HOST}/media.${mod}.json?ts=${ts}`).then(toJson) as Promise<ModuleMedia>));
+    const mods = (await fetch(`${CONST.SYSTEM.HOST}/mods.json?ts=${ts}`).then(toJson)) as Record<string, ModInfo>;
+    const fetchResult = await Promise.all(
+      Object.entries(mods)
+        .filter(([, mod]) => mod.hasMediaDir)
+        .map(([mod]) => fetch(`${CONST.SYSTEM.HOST}/media.${mod}.json?ts=${ts}`).then(toJson) as Promise<ModuleMedia>),
+    );
     const media = fetchResult.reduce(mergeFetchResult, {} as ModuleMedia);
     const injectArg: ModuleInject = { observer: this.observer, state: this.state, shared: this.shared, media };
 
@@ -50,15 +57,15 @@ export class VneCore {
     );
     console.log("init modules finish");
 
-    const started = VNE.EVENTS.SYSTEM?.STARTED;
-    if (started) await this.observer.emit(started);
+    const { STARTED } = (VNE.EVENTS as CorePluginEvents).SYSTEM;
+    await this.observer.emit(STARTED);
   };
 
   reset = async () => {
-    const EVENTS = VNE.EVENTS as unknown as CoreVnePluginEventsMap;
+    const { STORAGE, SYSTEM } = VNE.EVENTS as CorePluginEvents;
 
-    await this.observer.emit(EVENTS.STORAGE.CLEAR);
-    await this.observer.emit(EVENTS.SYSTEM.RELOAD);
+    await this.observer.emit(STORAGE.CLEAR);
+    await this.observer.emit(SYSTEM.RELOAD);
   };
 
   addModule = (ModuleClass: VneModuleClass) => {

package/src/types.ts

@@ -1,20 +1,25 @@
 import type { Module, ModuleMedia, ModuleShared } from "@vnejs/module";
+import type { VnePluginConstantsMapRegistry, VnePluginEventsMapRegistry } from "@vnejs/shared";
+import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscribeEvents } from "@vnejs/plugins.core.storage.contract";
+import type { Constants as SystemConstants, PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/plugins.core.system.contract";
 
 export type VneCoreModules = Record<string, Module | undefined>;
 
 export type { ModuleMedia, ModuleShared };
 
+export type ModInfo = Record<string, unknown> & {
+  hasMediaDir: boolean;
+  hasPublicDir: boolean;
+};
+
+export type CorePluginConstants = VnePluginConstantsMapRegistry & Record<SystemPluginName, SystemConstants>;
+
+export type CorePluginEvents = VnePluginEventsMapRegistry &
+  Record<SystemPluginName, SystemSubscribeEvents> &
+  Record<StoragePluginName, StorageSubscribeEvents>;
+
 declare global {
   interface Window {
     uninitedModules: string[];
   }
 }
-
-export interface CoreVnePluginEventsMap {
-  STORAGE: { CLEAR: string };
-  SYSTEM: { RELOAD: string; STARTED: string; HOST: string };
-}
-
-export interface CoreVnePluginConstantsMap {
-  SYSTEM: { HOST: string };
-}