@open-core/framework 1.0.5-beta.1 → 1.0.5-beta.2

package/dist/runtime/client/adapter/registry.js

@@ -0,0 +1,85 @@
+import { di } from '../client-container';
+import { bindClientTransportInstances, } from './client-adapter';
+import { IClientRuntimeBridge } from './runtime-bridge';
+let activeClientAdapterName = null;
+async function getDefaultClientAdapter() {
+    if (typeof __OPENCORE_TARGET__ !== 'undefined' && __OPENCORE_TARGET__ === 'client') {
+        throw new Error('[OpenCore] No client adapter provided. Configure one in opencore.config.ts or pass adapter to Client.init().');
+    }
+    const { createNodeClientAdapter } = await import('./node-client-adapter');
+    return createNodeClientAdapter();
+}
+function assertTokenAvailable(token, adapterName) {
+    if (di.isRegistered(token)) {
+        throw new Error(`[OpenCore] Adapter '${adapterName}' cannot bind an already registered token.`);
+    }
+}
+function createAdapterContext(adapterName) {
+    return {
+        adapterName,
+        container: di,
+        isRegistered(token) {
+            return di.isRegistered(token);
+        },
+        bindSingleton(token, implementation) {
+            assertTokenAvailable(token, adapterName);
+            di.registerSingleton(token, implementation);
+        },
+        bindInstance(token, value) {
+            assertTokenAvailable(token, adapterName);
+            di.registerInstance(token, value);
+        },
+        bindFactory(token, factory) {
+            assertTokenAvailable(token, adapterName);
+            di.register(token, { useFactory: factory });
+        },
+        bindMessagingTransport(transport) {
+            bindClientTransportInstances(this, transport);
+        },
+        useRuntimeBridge(runtime) {
+            this.bindInstance(IClientRuntimeBridge, runtime);
+        },
+    };
+}
+/**
+ * Installs the active client adapter for the current bootstrap.
+ */
+export async function installClientAdapter(adapter) {
+    const active = adapter ?? (await getDefaultClientAdapter());
+    if (activeClientAdapterName) {
+        if (activeClientAdapterName !== active.name) {
+            throw new Error(`[OpenCore] Client adapter '${active.name}' cannot be installed because '${activeClientAdapterName}' is already active.`);
+        }
+        return;
+    }
+    await active.register(createAdapterContext(active.name));
+    activeClientAdapterName = active.name;
+}
+export function getActiveClientAdapterName() {
+    return activeClientAdapterName ?? undefined;
+}
+export function assertClientAdapterCompatibility(adapter) {
+    if (!adapter || !activeClientAdapterName) {
+        return;
+    }
+    if (adapter.name !== activeClientAdapterName) {
+        throw new Error(`[OpenCore] Client adapter '${adapter.name}' does not match active adapter '${activeClientAdapterName}'.`);
+    }
+}
+export function getCurrentClientResourceName() {
+    if (di.isRegistered(IClientRuntimeBridge)) {
+        return di
+            .resolve(IClientRuntimeBridge)
+            .getCurrentResourceName();
+    }
+    const fn = globalThis.GetCurrentResourceName;
+    if (typeof fn === 'function') {
+        const name = fn();
+        if (typeof name === 'string' && name.trim())
+            return name;
+    }
+    return 'default';
+}
+export function __resetClientAdapterRegistryForTests() {
+    activeClientAdapterName = null;
+}

package/dist/runtime/client/adapter/runtime-bridge.d.ts

@@ -0,0 +1 @@
+export { IClientRuntimeBridge } from '../../../adapters/contracts/client/IClientRuntimeBridge';

package/dist/runtime/client/adapter/runtime-bridge.js

@@ -0,0 +1 @@
+export { IClientRuntimeBridge } from '../../../adapters/contracts/client/IClientRuntimeBridge';

package/dist/runtime/client/api.d.ts

@@ -1,8 +1,9 @@
 export * from './client-core';
 export * from './client-runtime';
+export * from './adapter';
 export * from './decorators';
 export * from './library';
-export * from './player/player';
 export * from './services';
 export * from './types';
+export * from './webview-bridge';
 export * from './ui-bridge';

package/dist/runtime/client/api.js

@@ -1,8 +1,9 @@
 export * from './client-core';
 export * from './client-runtime';
+export * from './adapter';
 export * from './decorators';
 export * from './library';
-export * from './player/player';
 export * from './services';
 export * from './types';
+export * from './webview-bridge';
 export * from './ui-bridge';

package/dist/runtime/client/client-bootstrap.js

@@ -1,13 +1,13 @@
-import { registerClientCapabilities } from '../../adapters/register-client-capabilities';
 import { MetadataScanner } from '../../kernel/di/metadata.scanner';
 import { loggers } from '../../kernel/logger';
+import { assertClientAdapterCompatibility, getActiveClientAdapterName, getCurrentClientResourceName, installClientAdapter, } from './adapter/registry';
 import { di } from './client-container';
 import { getClientRuntimeContext, setClientRuntimeContext, } from './client-runtime';
 import { getClientControllerRegistry } from './decorators';
-import { playerClientLoader } from './player/player.loader';
-import { BlipService, Camera, CameraEffectsRegistry, Cinematic, MarkerService, NotificationService, PedService, ProgressService, SpawnService, StreamingService, TextUIService, VehicleClientService, VehicleService, } from './services';
+import { BlipService, Camera, CameraEffectsRegistry, Cinematic, MarkerService, NotificationService, PedService, ProgressService, ClientSessionBridgeService, SpawnService, StreamingService, TextUIService, VehicleClientService, VehicleService, } from './services';
 import { registerSystemClient } from './system/processors.register';
-import { NuiBridge } from './ui-bridge';
+import { WebViewBridge } from './webview-bridge';
+import { WebViewService } from './webview.service';
 /**
  * Services that have an init() method which registers global runtime event listeners.
  *
@@ -15,13 +15,13 @@ import { NuiBridge } from './ui-bridge';
  * - Registered in DI for ALL modes (so they can be injected and used)
  * - Only initialized (.init() called) in CORE mode to avoid duplicate event handlers
  */
-const SERVICES_WITH_GLOBAL_LISTENERS = [SpawnService];
+const SERVICES_WITH_GLOBAL_LISTENERS = [SpawnService, ClientSessionBridgeService];
 /**
  * All client services that should be available in the DI container
  */
 // const ALL_CLIENT_SERVICES = [
 //   SpawnService,
-//   NuiBridge,
+//   WebViewBridge,
 //   NotificationService,
 //   TextUIService,
 //   ProgressService,
@@ -32,18 +32,6 @@ const SERVICES_WITH_GLOBAL_LISTENERS = [SpawnService];
 //   PedService,
 //   StreamingService,
 // ] as const
-/**
- * Get current resource name safely
- */
-function getCurrentResourceNameSafe() {
-    const fn = globalThis.GetCurrentResourceName;
-    if (typeof fn === 'function') {
-        const name = fn();
-        if (typeof name === 'string' && name.trim())
-            return name;
-    }
-    return 'default';
-}
 /**
  * Register singleton services in the DI container
  *
@@ -53,20 +41,38 @@ function getCurrentResourceNameSafe() {
  */
 function registerServices() {
     // Register all client services in DI (available in all modes)
-    di.registerSingleton(SpawnService, SpawnService);
-    di.registerSingleton(NuiBridge, NuiBridge);
-    di.registerSingleton(NotificationService, NotificationService);
-    di.registerSingleton(TextUIService, TextUIService);
-    di.registerSingleton(ProgressService, ProgressService);
-    di.registerSingleton(MarkerService, MarkerService);
-    di.registerSingleton(BlipService, BlipService);
-    di.registerSingleton(Camera, Camera);
-    di.registerSingleton(CameraEffectsRegistry, CameraEffectsRegistry);
-    di.registerSingleton(Cinematic, Cinematic);
-    di.registerSingleton(VehicleClientService, VehicleClientService);
-    di.registerSingleton(VehicleService, VehicleService);
-    di.registerSingleton(PedService, PedService);
-    di.registerSingleton(StreamingService, StreamingService);
+    if (!di.isRegistered(SpawnService))
+        di.registerSingleton(SpawnService, SpawnService);
+    if (!di.isRegistered(WebViewService))
+        di.registerSingleton(WebViewService, WebViewService);
+    if (!di.isRegistered(WebViewBridge))
+        di.registerSingleton(WebViewBridge, WebViewBridge);
+    if (!di.isRegistered(NotificationService))
+        di.registerSingleton(NotificationService, NotificationService);
+    if (!di.isRegistered(TextUIService))
+        di.registerSingleton(TextUIService, TextUIService);
+    if (!di.isRegistered(ProgressService))
+        di.registerSingleton(ProgressService, ProgressService);
+    if (!di.isRegistered(ClientSessionBridgeService))
+        di.registerSingleton(ClientSessionBridgeService, ClientSessionBridgeService);
+    if (!di.isRegistered(MarkerService))
+        di.registerSingleton(MarkerService, MarkerService);
+    if (!di.isRegistered(BlipService))
+        di.registerSingleton(BlipService, BlipService);
+    if (!di.isRegistered(Camera))
+        di.registerSingleton(Camera, Camera);
+    if (!di.isRegistered(CameraEffectsRegistry))
+        di.registerSingleton(CameraEffectsRegistry, CameraEffectsRegistry);
+    if (!di.isRegistered(Cinematic))
+        di.registerSingleton(Cinematic, Cinematic);
+    if (!di.isRegistered(VehicleClientService))
+        di.registerSingleton(VehicleClientService, VehicleClientService);
+    if (!di.isRegistered(VehicleService))
+        di.registerSingleton(VehicleService, VehicleService);
+    if (!di.isRegistered(PedService))
+        di.registerSingleton(PedService, PedService);
+    if (!di.isRegistered(StreamingService))
+        di.registerSingleton(StreamingService, StreamingService);
 }
 /**
  * Bootstrap services that need initialization
@@ -109,14 +115,13 @@ async function tryImportAutoLoad() {
  */
 export async function initClientCore(options = {}) {
     const mode = options.mode ?? 'CORE';
-    const resourceName = getCurrentResourceNameSafe();
-    // Register system processors early (needed for MetadataScanner)
-    // These processors are safe - they just process metadata, they don't register event handlers
-    // Each resource bundle needs its own copy registered in its DI container
-    registerSystemClient();
     // Check if already initialized
     const existingContext = getClientRuntimeContext();
     if (existingContext?.isInitialized) {
+        assertClientAdapterCompatibility(options.adapter);
+        // Register system processors for the active bundle if needed.
+        registerSystemClient();
+        const resourceName = getCurrentClientResourceName();
         // If already initialized, only scan controllers for this resource
         if (mode === 'RESOURCE' || mode === 'STANDALONE') {
             await tryImportAutoLoad();
@@ -128,29 +133,31 @@ export async function initClientCore(options = {}) {
         // If trying to initialize CORE mode twice, throw error
         throw new Error(`Client already initialized in ${existingContext.mode} mode by resource "${existingContext.resourceName}". Cannot initialize again in ${mode} mode.`);
     }
+    await installClientAdapter(options.adapter);
+    loggers.bootstrap.debug('Client adapter registered', {
+        adapter: getActiveClientAdapterName() ?? 'unknown',
+    });
+    const resourceName = getCurrentClientResourceName();
+    // Register system processors early (needed for MetadataScanner)
+    // These processors are safe - they just process metadata, they don't register event handlers
+    // Each resource bundle needs its own copy registered in its DI container
+    registerSystemClient();
     // Set runtime context
     setClientRuntimeContext({
         mode,
         resourceName,
         isInitialized: true,
     });
-    // Register client-side adapters (IPedAppearanceClient, IHasher)
-    await registerClientCapabilities();
     // Register all services in DI (available in all modes)
     registerServices();
     // Bootstrap services (only in CORE mode)
     // This is where services that register global event handlers are initialized
     await bootstrapServices(mode);
-    // Player loader (only in CORE mode)
-    if (mode === 'CORE') {
-        playerClientLoader();
-    }
     // Import framework controllers (only in CORE mode)
     // These controllers listen to global events and should only be registered once
     if (mode === 'CORE') {
         await import('./controllers/spawner.controller');
         await import('./controllers/appearance.controller');
-        await import('./controllers/player-sync.controller');
     }
     await tryImportAutoLoad();
     // Scan and register controllers

package/dist/runtime/client/client-core.d.ts

@@ -1,4 +1,6 @@
+import type { OpenCoreClientAdapter } from './adapter';
 import { ClientInitOptions } from './client-runtime';
+export declare function useAdapter(adapter: OpenCoreClientAdapter): void;
 /**
  * Initialize the OpenCore client framework
  *

package/dist/runtime/client/client-core.js

@@ -1,5 +1,10 @@
 import { initClientCore } from './client-bootstrap';
+import { installClientAdapter } from './adapter/registry';
 import { installClientPlugins } from './library/plugin/install-client-plugins';
+let pendingAdapter;
+export function useAdapter(adapter) {
+    pendingAdapter = adapter;
+}
 /**
  * Initialize the OpenCore client framework
  *
@@ -18,6 +23,10 @@ import { installClientPlugins } from './library/plugin/install-client-plugins';
  * ```
  */
 export async function init(options = {}) {
+    if (!options.adapter && pendingAdapter) {
+        options = { ...options, adapter: pendingAdapter };
+    }
+    await installClientAdapter(options.adapter);
     await installClientPlugins(options.plugins ?? [], options);
     await initClientCore(options);
 }

package/dist/runtime/client/client-runtime.d.ts

@@ -34,6 +34,8 @@ export interface ClientInitOptions {
      * Defaults to 'CORE' if not specified (for backwards compatibility).
      */
     mode?: ClientMode;
+    /** Optional runtime adapter for non-node client environments. */
+    adapter?: import('./adapter').OpenCoreClientAdapter;
     /**
      * Optional client plugins installed before bootstrap.
      */
@@ -61,3 +63,4 @@ export declare function setClientRuntimeContext(ctx: ClientRuntimeContext): void
  * Check if the client has been initialized
  */
 export declare function isClientInitialized(): boolean;
+export declare function __resetClientRuntimeContextForTests(): void;

package/dist/runtime/client/client-runtime.js

@@ -19,3 +19,6 @@ export function setClientRuntimeContext(ctx) {
 export function isClientInitialized() {
     return runtimeContext?.isInitialized ?? false;
 }
+export function __resetClientRuntimeContextForTests() {
+    runtimeContext = null;
+}

package/dist/runtime/client/controllers/appearance.controller.d.ts

@@ -1,8 +1,10 @@
 import { PlayerAppearance } from '../../../kernel/shared';
+import { IClientPlatformBridge } from '../adapter/platform-bridge';
 import { AppearanceService } from '../services/appearance.service';
 export declare class AppearanceTestClientController {
     private readonly appearanceService;
-    constructor(appearanceService: AppearanceService);
+    private readonly platform;
+    constructor(appearanceService: AppearanceService, platform: IClientPlatformBridge);
     onApply(appearance: PlayerAppearance): Promise<void>;
     onReset(): void;
 }

package/dist/runtime/client/controllers/appearance.controller.js

@@ -12,18 +12,26 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { inject } from 'tsyringe';
 import { Controller, OnNet } from '../decorators';
+import { IClientPlatformBridge } from '../adapter/platform-bridge';
 import { AppearanceService } from '../services/appearance.service';
+import { loggers } from '../../../kernel/logger';
 let AppearanceTestClientController = class AppearanceTestClientController {
     appearanceService;
-    constructor(appearanceService) {
+    platform;
+    constructor(appearanceService, platform) {
         this.appearanceService = appearanceService;
+        this.platform = platform;
     }
     async onApply(appearance) {
-        const ped = PlayerPedId();
+        loggers.netEvent.debug('appearance:apply received', {
+            appearance,
+        });
+        const ped = this.platform.getLocalPlayerPed();
         await this.appearanceService.applyAppearance(ped, appearance);
     }
     onReset() {
-        const ped = PlayerPedId();
+        loggers.netEvent.debug('appearance:reset received');
+        const ped = this.platform.getLocalPlayerPed();
         this.appearanceService.setDefaultAppearance(ped);
         this.appearanceService.clearTattoos(ped);
     }
@@ -43,6 +51,8 @@ __decorate([
 AppearanceTestClientController = __decorate([
     Controller(),
     __param(0, inject(AppearanceService)),
-    __metadata("design:paramtypes", [AppearanceService])
+    __param(1, inject(IClientPlatformBridge)),
+    __metadata("design:paramtypes", [AppearanceService,
+        IClientPlatformBridge])
 ], AppearanceTestClientController);
 export { AppearanceTestClientController };

package/dist/runtime/client/controllers/spawner.controller.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { loggers } from '../../../kernel/logger';
 import { Controller, OnNet } from '../decorators';
 import { SpawnService } from '../services';
 let SpawnerController = class SpawnerController {
@@ -15,6 +16,7 @@ let SpawnerController = class SpawnerController {
         this.spawnService = spawnService;
     }
     async handleSpawn(data) {
+        loggers.spawn.debug('Spawn event received', data);
         await this.spawnService.spawn(data.position, data.model);
     }
     async handleRespawn(position, heading = 0.0) {

package/dist/runtime/client/decorators/controller.js

@@ -1,16 +1,8 @@
 import { injectable } from 'tsyringe';
+import { getCurrentClientResourceName } from '../adapter/registry';
 import { METADATA_KEYS } from '../system/metadata-client.keys';
 import { getClientRuntimeContext } from '../client-runtime';
 const clientControllerRegistryByResource = new Map();
-function getCurrentResourceNameSafe() {
-    const fn = globalThis.GetCurrentResourceName;
-    if (typeof fn === 'function') {
-        const name = fn();
-        if (typeof name === 'string' && name.trim())
-            return name;
-    }
-    return 'default';
-}
 function resolveRegistryKey(resourceName) {
     if (resourceName?.trim()) {
         return resourceName;
@@ -19,7 +11,7 @@ function resolveRegistryKey(resourceName) {
     if (runtime?.resourceName?.trim()) {
         return runtime.resourceName;
     }
-    return getCurrentResourceNameSafe();
+    return getCurrentClientResourceName();
 }
 export function getClientControllerRegistry(resourceName) {
     const key = resolveRegistryKey(resourceName);

package/dist/runtime/client/decorators/onView.d.ts

@@ -1,11 +1,11 @@
 /**
- * Registers a method as an onView callback handler. View are equal to NUI
+ * Registers a method as a WebView callback handler.
  *
  * @remarks
  * This decorator only stores metadata. During bootstrap, the framework binds the decorated method
- * to the NUI callback event name.
+ * to the active WebView runtime callback.
  *
- * @param eventName - onView callback name.
+ * @param eventName - Callback name.
  *
  * @example
  * ```ts

package/dist/runtime/client/decorators/onView.js

@@ -1,12 +1,12 @@
 import { METADATA_KEYS } from '../system/metadata-client.keys';
 /**
- * Registers a method as an onView callback handler. View are equal to NUI
+ * Registers a method as a WebView callback handler.
  *
  * @remarks
  * This decorator only stores metadata. During bootstrap, the framework binds the decorated method
- * to the NUI callback event name.
+ * to the active WebView runtime callback.
  *
- * @param eventName - onView callback name.
+ * @param eventName - Callback name.
  *
  * @example
  * ```ts

package/dist/runtime/client/index.d.ts

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './adapter';
 export { Client, createClientRuntime } from './client-api-runtime';
 export type { ClientApi } from './client-api-runtime';
 export type { ClientPluginApi, OpenCoreClientPlugin, PluginInstallContext as ClientPluginInstallContext, } from './library/plugin';

package/dist/runtime/client/index.js

@@ -1,2 +1,3 @@
 export * from './api';
+export * from './adapter';
 export { Client, createClientRuntime } from './client-api-runtime';

package/dist/runtime/client/library/create-client-library.js

@@ -1,3 +1,5 @@
+import { EventsAPI } from '../../../adapters/contracts/transport/events.api';
+import { di } from '../client-container';
 import { coreLogger } from '../../../kernel/logger';
 import { buildLibraryEventId, createLibraryBase, createLibraryConfigAccessor, } from '../../core/library';
 import { emitLibraryEvent } from '../bus/library-event.bus';
@@ -14,6 +16,9 @@ export function createClientLibrary(name, opts) {
     const base = createLibraryBase(name, opts);
     const logger = coreLogger.client(`Library:${base.name}`);
     const emitInternal = base.emit;
+    const events = di.isRegistered(EventsAPI)
+        ? di.resolve(EventsAPI)
+        : null;
     return {
         ...base,
         side: 'client',
@@ -33,7 +38,10 @@ export function createClientLibrary(name, opts) {
             emitLibraryEvent(eventId, envelope);
         },
         emitServer(eventName, payload) {
-            emitNet(base.buildEventName(eventName), payload);
+            if (!events) {
+                throw new Error('[OpenCore] Client events transport is not registered.');
+            }
+            events.emit(base.buildEventName(eventName), payload);
         },
         getLogger() {
             return logger;

package/dist/runtime/client/services/appearance.service.d.ts

@@ -1,4 +1,4 @@
-import { IPedAppearanceClient } from '../../../adapters/contracts/client/IPedAppearanceClient';
+import { IGtaPedAppearanceBridge } from '../../../adapters/contracts/client/IGtaPedAppearanceBridge';
 import { IHasher } from '../../../adapters/contracts/IHasher';
 import { AppearanceValidationResult, PlayerAppearance } from '../../../kernel/shared';
 /**
@@ -23,7 +23,7 @@ import { AppearanceValidationResult, PlayerAppearance } from '../../../kernel/sh
 export declare class AppearanceService {
     private pedAdapter;
     private hasher;
-    constructor(pedAdapter: IPedAppearanceClient, hasher: IHasher);
+    constructor(pedAdapter: IGtaPedAppearanceBridge, hasher: IHasher);
     /**
      * Applies a complete appearance to a ped.
      *

package/dist/runtime/client/services/appearance.service.js

@@ -11,7 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { inject, injectable } from 'tsyringe';
-import { IPedAppearanceClient } from '../../../adapters/contracts/client/IPedAppearanceClient';
+import { IGtaPedAppearanceBridge } from '../../../adapters/contracts/client/IGtaPedAppearanceBridge';
 import { IHasher } from '../../../adapters/contracts/IHasher';
 /**
  * Client-side appearance management service.
@@ -309,7 +309,10 @@ let AppearanceService = class AppearanceService {
      * @param ped - Ped entity handle
      */
     setDefaultAppearance(ped) {
-        this.pedAdapter.setDefaultComponentVariation(ped);
+        const adapter = this.pedAdapter;
+        if (typeof adapter?.setDefaultComponentVariation === 'function') {
+            adapter.setDefaultComponentVariation(ped);
+        }
     }
     /**
      * Clears all tattoos from a ped.
@@ -322,9 +325,9 @@ let AppearanceService = class AppearanceService {
 };
 AppearanceService = __decorate([
     injectable(),
-    __param(0, inject(IPedAppearanceClient)),
+    __param(0, inject(IGtaPedAppearanceBridge)),
     __param(1, inject(IHasher)),
-    __metadata("design:paramtypes", [IPedAppearanceClient,
+    __metadata("design:paramtypes", [IGtaPedAppearanceBridge,
         IHasher])
 ], AppearanceService);
 export { AppearanceService };