Merge branch 'v1-beta' of github.com:newcore-network/opencore into v1-beta

Ivanruii · Ivanruii · commit 090c3563856f · 2026-03-13T14:50:53.000+01:00
diff --git a/src/runtime/adapter-runtime.ts b/src/runtime/adapter-runtime.ts
@@ -0,0 +1,24 @@
+export type OpenCoreRuntimeKind = 'node' | 'fivem' | 'redm' | 'ragemp'
+
+export interface OpenCoreRuntimeSideHints {
+  platform?: 'node' | 'neutral' | 'browser'
+  target?: string
+  format?: 'cjs' | 'esm' | 'iife'
+  outFileName?: string
+  outputRoot?: 'resource' | 'packages' | 'client_packages'
+}
+
+export interface OpenCoreRuntimeManifestHints {
+  kind?: 'fxmanifest' | 'none'
+}
+
+export interface OpenCoreRuntimeHints {
+  runtime: OpenCoreRuntimeKind
+  server?: OpenCoreRuntimeSideHints
+  client?: OpenCoreRuntimeSideHints
+  manifest?: OpenCoreRuntimeManifestHints
+}
+
+export function defineRuntimeHints(hints: OpenCoreRuntimeHints): OpenCoreRuntimeHints {
+  return hints
+}
diff --git a/src/runtime/client/adapter/client-adapter.ts b/src/runtime/client/adapter/client-adapter.ts
@@ -2,13 +2,15 @@ import type { DependencyContainer } from 'tsyringe'
 import { EventsAPI } from '../../../adapters/contracts/transport/events.api'
 import { MessagingTransport } from '../../../adapters/contracts/transport/messaging.transport'
 import { RpcAPI } from '../../../adapters/contracts/transport/rpc.api'
+import type { OpenCoreRuntimeHints } from '../../adapter-runtime'
 import { IClientRuntimeBridge } from './runtime-bridge'
 
 /**
  * Public contract implemented by external client adapters.
  */
 export interface OpenCoreClientAdapter {
   readonly name: string
+  readonly runtime?: OpenCoreRuntimeHints
   register(context: ClientAdapterContext): void | Promise<void>
 }
 
diff --git a/src/runtime/client/adapter/index.ts b/src/runtime/client/adapter/index.ts
@@ -1,4 +1,5 @@
 export * from './client-adapter'
+export * from '../../adapter-runtime'
 export * from './local-player-bridge'
 export * from './registry'
 export * from './runtime-bridge'
diff --git a/src/runtime/client/client-bootstrap.ts b/src/runtime/client/client-bootstrap.ts
@@ -11,6 +11,7 @@ import {
   type ClientInitOptions,
   type ClientMode,
   getClientRuntimeContext,
+  resolveClientAdapter,
   setClientRuntimeContext,
 } from './client-runtime'
 import { getClientControllerRegistry } from './decorators'
@@ -136,11 +137,12 @@ async function tryImportAutoLoad() {
  */
 export async function initClientCore(options: ClientInitOptions = {}) {
   const mode: ClientMode = options.mode ?? 'CORE'
+  const activeAdapter = resolveClientAdapter(options)
 
   // Check if already initialized
   const existingContext = getClientRuntimeContext()
   if (existingContext?.isInitialized) {
-    assertClientAdapterCompatibility(options.adapter)
+    assertClientAdapterCompatibility(activeAdapter)
 
     // Register system processors for the active bundle if needed.
     registerSystemClient()
@@ -162,7 +164,7 @@ export async function initClientCore(options: ClientInitOptions = {}) {
     )
   }
 
-  await installClientAdapter(options.adapter)
+  await installClientAdapter(activeAdapter)
   loggers.bootstrap.debug('Client adapter registered', {
     adapter: getActiveClientAdapterName() ?? 'unknown',
   })
diff --git a/src/runtime/client/client-runtime.ts b/src/runtime/client/client-runtime.ts
@@ -1,4 +1,5 @@
 import type { OpenCoreClientPlugin } from './library/plugin'
+import { getInjectedClientAdapter } from '../project-adapter'
 
 /**
  * Client Runtime Configuration
@@ -84,3 +85,7 @@ export function isClientInitialized(): boolean {
 export function __resetClientRuntimeContextForTests(): void {
   runtimeContext = null
 }
+
+export function resolveClientAdapter(options: ClientInitOptions = {}) {
+  return options.adapter ?? getInjectedClientAdapter()
+}
diff --git a/src/runtime/client/index.ts b/src/runtime/client/index.ts
@@ -1,4 +1,5 @@
 export * from './api'
+export * from '../adapter-runtime'
 export { Client, createClientRuntime } from './client-api-runtime'
 export type { ClientApi } from './client-api-runtime'
 export type {
diff --git a/src/runtime/project-adapter.ts b/src/runtime/project-adapter.ts
@@ -0,0 +1,20 @@
+import type { OpenCoreClientAdapter } from './client/adapter'
+import type { OpenCoreServerAdapter } from './server/adapter'
+
+declare global {
+  var __OPENCORE_PROJECT_SERVER_ADAPTER__: OpenCoreServerAdapter | undefined
+  var __OPENCORE_PROJECT_CLIENT_ADAPTER__: OpenCoreClientAdapter | undefined
+}
+
+export function getInjectedServerAdapter(): OpenCoreServerAdapter | undefined {
+  return globalThis.__OPENCORE_PROJECT_SERVER_ADAPTER__
+}
+
+export function getInjectedClientAdapter(): OpenCoreClientAdapter | undefined {
+  return globalThis.__OPENCORE_PROJECT_CLIENT_ADAPTER__
+}
+
+export function __resetInjectedProjectAdaptersForTests(): void {
+  delete globalThis.__OPENCORE_PROJECT_SERVER_ADAPTER__
+  delete globalThis.__OPENCORE_PROJECT_CLIENT_ADAPTER__
+}
diff --git a/src/runtime/server/adapter/index.ts b/src/runtime/server/adapter/index.ts
@@ -1,4 +1,5 @@
 export * from './node-server-adapter'
+export * from '../../adapter-runtime'
 export * from './player-adapter'
 export * from './registry'
 export * from './serialization'
diff --git a/src/runtime/server/adapter/server-adapter.ts b/src/runtime/server/adapter/server-adapter.ts
@@ -2,13 +2,15 @@ import type { DependencyContainer } from 'tsyringe'
 import { EventsAPI } from '../../../adapters/contracts/transport/events.api'
 import { MessagingTransport } from '../../../adapters/contracts/transport/messaging.transport'
 import { RpcAPI } from '../../../adapters/contracts/transport/rpc.api'
+import type { OpenCoreRuntimeHints } from '../../adapter-runtime'
 import { ServerPlayerAdapter } from './player-adapter'
 
 /**
  * Public contract implemented by external server adapters.
  */
 export interface OpenCoreServerAdapter {
   readonly name: string
+  readonly runtime?: OpenCoreRuntimeHints
   register(context: ServerAdapterContext): void | Promise<void>
 }
 
diff --git a/src/runtime/server/bootstrap.ts b/src/runtime/server/bootstrap.ts
@@ -5,6 +5,7 @@ import { GLOBAL_CONTAINER, MetadataScanner } from '../../kernel/di/index'
 import { getLogLevel, LogLevelLabels, loggers } from '../../kernel/logger'
 import { createNodeServerAdapter } from './adapter/node-server-adapter'
 import { installServerAdapter } from './adapter/registry'
+import { getInjectedServerAdapter } from '../project-adapter'
 import { PrincipalProviderContract } from './contracts/index'
 import { BinaryServiceMetadata, getServerBinaryServiceRegistry } from './decorators/binaryService'
 import { getServerControllerRegistry } from './decorators/controller'
@@ -111,12 +112,14 @@ export async function initServer(
     scope: getFrameworkModeScope(ctx.mode),
   })
 
+  const activeAdapter = options.adapter ?? getInjectedServerAdapter() ?? createNodeServerAdapter()
+
   // Register platform-specific capabilities through the selected server adapter.
-  await installServerAdapter(options.adapter ?? createNodeServerAdapter())
+  await installServerAdapter(activeAdapter)
 
   const platformContext = GLOBAL_CONTAINER.resolve(IPlatformContext as any) as IPlatformContext
   loggers.bootstrap.debug('Loading server Adapter ', {
-    adapter: options.adapter?.name ?? 'node',
+    adapter: activeAdapter.name,
     game: platformContext.gameProfile,
   })
 
diff --git a/src/runtime/server/index.ts b/src/runtime/server/index.ts
@@ -3,6 +3,7 @@ import { GLOBAL_CONTAINER } from '../../kernel/di/container'
 globalThis.oc_container = GLOBAL_CONTAINER
 
 export * from './api'
+export * from '../adapter-runtime'
 export { Server, createServerRuntime } from './server.runtime'
 export type { ServerApi } from './server.runtime'
 export type { ServerPluginApi } from './library/plugin/server-plugin-api'
diff --git a/tests/helpers/di.helper.ts b/tests/helpers/di.helper.ts
@@ -3,6 +3,7 @@ import { container } from 'tsyringe'
 import { __resetClientAdapterRegistryForTests } from '../../src/runtime/client/adapter/registry'
 import { __resetClientProcessorRegistrationForTests } from '../../src/runtime/client/system/processors.register'
 import { __resetClientRuntimeContextForTests } from '../../src/runtime/client/client-runtime'
+import { __resetInjectedProjectAdaptersForTests } from '../../src/runtime/project-adapter'
 import { __resetServerAdapterRegistryForTests } from '../../src/runtime/server/adapter/registry'
 
 /**
@@ -15,6 +16,7 @@ export function resetContainer(): void {
   __resetClientProcessorRegistrationForTests()
   __resetClientRuntimeContextForTests()
   __resetServerAdapterRegistryForTests()
+  __resetInjectedProjectAdaptersForTests()
 }
 
 /**
diff --git a/tests/integration/server/node-bootstrap.test.ts b/tests/integration/server/node-bootstrap.test.ts
@@ -14,6 +14,7 @@ import { NodeResourceInfo } from '../../../src/adapters/node/node-resourceinfo'
 import { NodeTick } from '../../../src/adapters/node/node-tick'
 import { GLOBAL_CONTAINER } from '../../../src/kernel/di/container'
 import { initServer } from '../../../src/runtime/server/bootstrap'
+import { defineServerAdapter, getActiveServerAdapterName } from '../../../src/runtime/server/adapter'
 import { resolveRuntimeOptions } from '../../../src/runtime/server/runtime'
 import { resetContainer } from '../../helpers/di.helper'
 
@@ -104,4 +105,30 @@ describe('Node.js Runtime Bootstrap', () => {
     if (resourceInfo instanceof IResourceInfo)
       expect(resourceInfo.getCurrentResourceName()).toBe('default')
   })
+
+  it('should use the injected project adapter before the node default', async () => {
+    globalThis.__OPENCORE_PROJECT_SERVER_ADAPTER__ = defineServerAdapter({
+      name: 'injected-server',
+      async register(ctx) {
+        ctx.bindMessagingTransport(new NodeMessagingTransport('server'))
+        ctx.bindInstance(IExports as any, new NodeExports())
+        ctx.bindInstance(IEngineEvents as any, new NodeEngineEvents())
+        ctx.bindInstance(IResourceInfo as any, new NodeResourceInfo())
+        ctx.bindInstance(ITick as any, new NodeTick())
+      },
+    })
+
+    const options = resolveRuntimeOptions({
+      mode: 'CORE',
+      features: {
+        disabled: ['runtimeEvents', 'chat', 'principal', 'sessionLifecycle'],
+      },
+    })
+
+    await initServer(options)
+
+    expect(getActiveServerAdapterName()).toBe('injected-server')
+    const messagingTransport = GLOBAL_CONTAINER.resolve(MessagingTransport as any)
+    expect(messagingTransport).toBeInstanceOf(NodeMessagingTransport)
+  })
 })
diff --git a/tests/unit/runtime/client/adapter-bootstrap.test.ts b/tests/unit/runtime/client/adapter-bootstrap.test.ts
@@ -101,6 +101,26 @@ describe('client adapter bootstrap', () => {
     expect(getClientRuntimeContext()?.resourceName).toBe('custom-resource')
   })
 
+  it('prefers the injected project adapter before the node default', async () => {
+    const runtime = new CustomRuntimeBridge()
+    globalThis.__OPENCORE_PROJECT_CLIENT_ADAPTER__ = defineClientAdapter({
+      name: 'injected-client',
+      async register(ctx) {
+        const { NodeMessagingTransport } = await import(
+          '../../../../src/adapters/node/transport/adapter'
+        )
+        ctx.bindMessagingTransport(new NodeMessagingTransport('client'))
+        ctx.bindInstance(IClientRuntimeBridge as any, runtime)
+        ctx.bindInstance(IClientLocalPlayerBridge as any, new NoopLocalPlayerBridge())
+      },
+    })
+
+    await initClientCore({ mode: 'STANDALONE' })
+
+    expect(getActiveClientAdapterName()).toBe('injected-client')
+    expect(getClientRuntimeContext()?.resourceName).toBe('custom-resource')
+  })
+
   it('throws when re-initialized with a different adapter', async () => {
     const makeAdapter = (name: string) =>
       defineClientAdapter({
diff --git a/tests/unit/server/adapter/server-adapter.test.ts b/tests/unit/server/adapter/server-adapter.test.ts
@@ -5,6 +5,7 @@ import { resetContainer } from '../../../helpers/di.helper'
 import {
   createLocalServerPlayer,
   createRemoteServerPlayer,
+  defineRuntimeHints,
   defineServerAdapter,
   installServerAdapter,
   serializeServerPlayerData,
@@ -96,4 +97,30 @@ describe('server adapter registry', () => {
     expect(remotePlayer.hasState('ready')).toBe(true)
     expect((remotePlayer as ExtendedPlayer).adapterKind).toBe('local')
   })
+
+  it('keeps shared runtime hints on adapter definitions', () => {
+    const runtime = defineRuntimeHints({
+      runtime: 'ragemp',
+      server: {
+        target: 'node14',
+        outputRoot: 'packages',
+        outFileName: 'index.js',
+      },
+      client: {
+        outputRoot: 'client_packages',
+        outFileName: 'index.js',
+      },
+      manifest: {
+        kind: 'none',
+      },
+    })
+
+    const adapter = defineServerAdapter({
+      name: 'ragemp',
+      runtime,
+      register() {},
+    })
+
+    expect(adapter.runtime).toEqual(runtime)
+  })
 })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export * from './api'`
	`2`	`+export * from '../adapter-runtime'`
`2`	`3`	`export { Client, createClientRuntime } from './client-api-runtime'`
`3`	`4`	`export type { ClientApi } from './client-api-runtime'`
`4`	`5`	`export type {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export * from './node-server-adapter'`
	`2`	`+export * from '../../adapter-runtime'`
`2`	`3`	`export * from './player-adapter'`
`3`	`4`	`export * from './registry'`
`4`	`5`	`export * from './serialization'`