chore(remotes): refactor folder structure into platform/ and kernel/

packages/kernel-browser-runtime/src/PlatformServicesServer.test.ts

@@ -18,7 +18,7 @@ import type {
   PlatformServicesStream,
 } from './PlatformServicesServer.ts';
 
-// Mock initNetwork from ocap-kernel
+// Mock initTransport from ocap-kernel
 const mockSendRemoteMessage = vi.fn(async () => undefined);
 const mockStop = vi.fn(async () => undefined);
 const mockCloseConnection = vi.fn(async () => undefined);
@@ -35,7 +35,7 @@ vi.mock('@metamask/ocap-kernel', () => ({
     terminate: 'terminate',
     terminateAll: 'terminateAll',
   },
-  initNetwork: vi.fn(
+  initTransport: vi.fn(
     async (
       _keySeed: string,
       _options: unknown,
@@ -400,8 +400,8 @@ describe('PlatformServicesServer', () => {
           );
           await delay(10);
 
-          const { initNetwork } = await import('@metamask/ocap-kernel');
-          expect(initNetwork).toHaveBeenCalledWith(
+          const { initTransport } = await import('@metamask/ocap-kernel');
+          expect(initTransport).toHaveBeenCalledWith(
             keySeed,
             { relays },
             expect.any(Function),
@@ -422,8 +422,8 @@ describe('PlatformServicesServer', () => {
           );
           await delay(10);
 
-          const { initNetwork } = await import('@metamask/ocap-kernel');
-          expect(initNetwork).toHaveBeenCalledWith(
+          const { initTransport } = await import('@metamask/ocap-kernel');
+          expect(initTransport).toHaveBeenCalledWith(
             keySeed,
             options,
             expect.any(Function),
@@ -458,7 +458,7 @@ describe('PlatformServicesServer', () => {
       });
 
       describe('handleRemoteMessage', () => {
-        it('captures handler from initNetwork', async () => {
+        it('captures handler from initTransport', async () => {
           const keySeed = '0xabcd';
           const relays = ['/dns4/relay.example/tcp/443/wss/p2p/relayPeer'];
 
@@ -529,7 +529,7 @@ describe('PlatformServicesServer', () => {
       });
 
       describe('handleRemoteGiveUp', () => {
-        it('captures handler from initNetwork', async () => {
+        it('captures handler from initTransport', async () => {
           const keySeed = '0xabcd';
           const relays = ['/dns4/relay.example/tcp/443/wss/p2p/relayPeer'];
 
@@ -658,17 +658,17 @@ describe('PlatformServicesServer', () => {
           await stream.receiveInput(makeStopRemoteCommsMessageEvent('m1'));
           await delay(10);
 
-          const { initNetwork } = await import('@metamask/ocap-kernel');
-          const firstCallCount = (initNetwork as Mock).mock.calls.length;
+          const { initTransport } = await import('@metamask/ocap-kernel');
+          const firstCallCount = (initTransport as Mock).mock.calls.length;
 
           // Re-initialize should work
           await stream.receiveInput(
             makeInitializeRemoteCommsMessageEvent('m2', keySeed, { relays }),
           );
           await delay(10);
 
-          // Should have called initNetwork again
-          expect((initNetwork as Mock).mock.calls).toHaveLength(
+          // Should have called initTransport again
+          expect((initTransport as Mock).mock.calls).toHaveLength(
             firstCallCount + 1,
           );
         });

packages/kernel-browser-runtime/src/PlatformServicesServer.ts

@@ -13,7 +13,7 @@ import type {
   StopRemoteComms,
   RemoteCommsOptions,
 } from '@metamask/ocap-kernel';
-import { initNetwork } from '@metamask/ocap-kernel';
+import { initTransport } from '@metamask/ocap-kernel';
 import {
   kernelRemoteMethodSpecs,
   platformServicesHandlers,
@@ -288,7 +288,7 @@ export class PlatformServicesServer {
       closeConnection,
       registerLocationHints,
       reconnectPeer,
-    } = await initNetwork(
+    } = await initTransport(
       keySeed,
       options,
       this.#handleRemoteMessage.bind(this),

packages/nodejs/src/kernel/PlatformServices.test.ts

@@ -79,7 +79,7 @@ vi.mock('@metamask/ocap-kernel', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@metamask/ocap-kernel')>();
   return {
     ...actual,
-    initNetwork: vi.fn(async () => ({
+    initTransport: vi.fn(async () => ({
       sendRemoteMessage: mockSendRemoteMessage,
       stop: mockStop,
       closeConnection: mockCloseConnection,
@@ -245,8 +245,8 @@ describe('NodejsPlatformServices', () => {
 
         await service.initializeRemoteComms(keySeed, { relays }, remoteHandler);
 
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        expect(initNetwork).toHaveBeenCalledWith(
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        expect(initTransport).toHaveBeenCalledWith(
           keySeed,
           { relays },
           expect.any(Function),
@@ -266,8 +266,8 @@ describe('NodejsPlatformServices', () => {
 
         await service.initializeRemoteComms(keySeed, options, remoteHandler);
 
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        expect(initNetwork).toHaveBeenCalledWith(
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        expect(initTransport).toHaveBeenCalledWith(
           keySeed,
           options,
           expect.any(Function),
@@ -289,8 +289,8 @@ describe('NodejsPlatformServices', () => {
           giveUpHandler,
         );
 
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        expect(initNetwork).toHaveBeenCalledWith(
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        expect(initTransport).toHaveBeenCalledWith(
           keySeed,
           { relays },
           expect.any(Function),
@@ -332,17 +332,17 @@ describe('NodejsPlatformServices', () => {
 
         await service.initializeRemoteComms('0xtest', {}, remoteHandler);
 
-        // Simulate handleRemoteMessage being called (via initNetwork callback)
+        // Simulate handleRemoteMessage being called (via initTransport callback)
         // The handler should call sendRemoteMessage if reply is non-empty
         mockSendRemoteMessage.mockClear();
 
-        // Call the handler that was passed to initNetwork
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        const initNetworkMock = initNetwork as unknown as ReturnType<
+        // Call the handler that was passed to initTransport
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        const initTransportMock = initTransport as unknown as ReturnType<
           typeof vi.fn
         >;
         const lastCall =
-          initNetworkMock.mock.calls[initNetworkMock.mock.calls.length - 1];
+          initTransportMock.mock.calls[initTransportMock.mock.calls.length - 1];
         const handleRemoteMessage = lastCall?.[2] as (
           from: string,
           message: string,
@@ -365,13 +365,13 @@ describe('NodejsPlatformServices', () => {
 
         mockSendRemoteMessage.mockClear();
 
-        // Call the handler that was passed to initNetwork
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        const initNetworkMock = initNetwork as unknown as ReturnType<
+        // Call the handler that was passed to initTransport
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        const initTransportMock = initTransport as unknown as ReturnType<
           typeof vi.fn
         >;
         const lastCall =
-          initNetworkMock.mock.calls[initNetworkMock.mock.calls.length - 1];
+          initTransportMock.mock.calls[initTransportMock.mock.calls.length - 1];
         const handleRemoteMessage = lastCall?.[2] as (
           from: string,
           message: string,
@@ -440,11 +440,11 @@ describe('NodejsPlatformServices', () => {
         // Initialize
         await service.initializeRemoteComms(keySeed, { relays }, remoteHandler);
 
-        const { initNetwork } = await import('@metamask/ocap-kernel');
-        const initNetworkMock = initNetwork as unknown as ReturnType<
+        const { initTransport } = await import('@metamask/ocap-kernel');
+        const initTransportMock = initTransport as unknown as ReturnType<
           typeof vi.fn
         >;
-        const firstCallCount = initNetworkMock.mock.calls.length;
+        const firstCallCount = initTransportMock.mock.calls.length;
 
         // Stop
         await service.stopRemoteComms();
@@ -453,8 +453,8 @@ describe('NodejsPlatformServices', () => {
         // Re-initialize should work
         await service.initializeRemoteComms(keySeed, { relays }, remoteHandler);
 
-        // Should have called initNetwork again
-        expect(initNetworkMock.mock.calls).toHaveLength(firstCallCount + 1);
+        // Should have called initTransport again
+        expect(initTransportMock.mock.calls).toHaveLength(firstCallCount + 1);
       });
 
       it('clears internal state after stop', async () => {

packages/nodejs/src/kernel/PlatformServices.ts

@@ -10,7 +10,7 @@ import type {
   StopRemoteComms,
   RemoteCommsOptions,
 } from '@metamask/ocap-kernel';
-import { initNetwork } from '@metamask/ocap-kernel';
+import { initTransport } from '@metamask/ocap-kernel';
 import { NodeWorkerDuplexStream } from '@metamask/streams';
 import type { DuplexStream } from '@metamask/streams';
 import { strict as assert } from 'node:assert';
@@ -249,7 +249,7 @@ export class NodejsPlatformServices implements PlatformServices {
       closeConnection,
       registerLocationHints,
       reconnectPeer,
-    } = await initNetwork(
+    } = await initTransport(
       keySeed,
       options,
       this.#handleRemoteMessage.bind(this),

packages/ocap-kernel/src/Kernel.test.ts

@@ -66,7 +66,7 @@ vi.mock('./KernelQueue.ts', () => {
   return { KernelQueue: mocks.KernelQueue };
 });
 
-vi.mock('./remotes/RemoteManager.ts', () => {
+vi.mock('./remotes/kernel/RemoteManager.ts', () => {
   return { RemoteManager: mocks.RemoteManager };
 });
 

packages/ocap-kernel/src/Kernel.ts

@@ -12,8 +12,8 @@ import { KernelQueue } from './KernelQueue.ts';
 import { KernelRouter } from './KernelRouter.ts';
 import { KernelServiceManager } from './KernelServiceManager.ts';
 import type { KernelService } from './KernelServiceManager.ts';
-import { OcapURLManager } from './remotes/OcapURLManager.ts';
-import { RemoteManager } from './remotes/RemoteManager.ts';
+import { OcapURLManager } from './remotes/kernel/OcapURLManager.ts';
+import { RemoteManager } from './remotes/kernel/RemoteManager.ts';
 import type { RemoteCommsOptions } from './remotes/types.ts';
 import { kernelHandlers } from './rpc/index.ts';
 import type { PingVatResult } from './rpc/index.ts';

packages/ocap-kernel/src/index.test.ts

@@ -14,7 +14,7 @@ describe('index', () => {
       'VatHandle',
       'VatIdStruct',
       'VatSupervisor',
-      'initNetwork',
+      'initTransport',
       'isVatConfig',
       'isVatId',
       'krefOf',

packages/ocap-kernel/src/index.ts

@@ -1,7 +1,7 @@
 export { Kernel } from './Kernel.ts';
 export { VatHandle } from './vats/VatHandle.ts';
 export { VatSupervisor } from './vats/VatSupervisor.ts';
-export { initNetwork } from './remotes/network.ts';
+export { initTransport } from './remotes/platform/transport.ts';
 export type {
   ClusterConfig,
   KRef,

packages/ocap-kernel/src/remotes/OcapURLManager.test.ts → packages/ocap-kernel/src/remotes/kernel/OcapURLManager.test.ts

@@ -4,10 +4,10 @@ import type { Mock } from 'vitest';
 import { OcapURLManager } from './OcapURLManager.ts';
 import type { RemoteHandle } from './RemoteHandle.ts';
 import type { RemoteManager } from './RemoteManager.ts';
-import type { RemoteComms } from './types.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { SlotValue } from '../liveslots/kernel-marshal.ts';
-import { kslot } from '../liveslots/kernel-marshal.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { SlotValue } from '../../liveslots/kernel-marshal.ts';
+import { kslot } from '../../liveslots/kernel-marshal.ts';
+import type { RemoteComms } from '../types.ts';
 
 type RedeemService = {
   redeem: (url: string) => Promise<SlotValue>;

packages/ocap-kernel/src/remotes/OcapURLManager.ts → packages/ocap-kernel/src/remotes/kernel/OcapURLManager.ts

@@ -1,10 +1,10 @@
 import { Far } from '@endo/marshal';
 
-import { kslot, krefOf } from '../liveslots/kernel-marshal.ts';
-import type { SlotValue } from '../liveslots/kernel-marshal.ts';
-import type { KRef } from '../types.ts';
 import { parseOcapURL } from './remote-comms.ts';
 import type { RemoteManager } from './RemoteManager.ts';
+import { kslot, krefOf } from '../../liveslots/kernel-marshal.ts';
+import type { SlotValue } from '../../liveslots/kernel-marshal.ts';
+import type { KRef } from '../../types.ts';
 
 type OcapURLManagerConstructorProps = {
   remoteManager: RemoteManager;

packages/ocap-kernel/src/remotes/RemoteHandle.test.ts → packages/ocap-kernel/src/remotes/kernel/RemoteHandle.test.ts

@@ -3,13 +3,13 @@ import type { Logger } from '@metamask/logger';
 import { makeAbortSignalMock } from '@ocap/repo-tools/test-utils';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
-import type { KernelQueue } from '../KernelQueue.ts';
 import { RemoteHandle } from './RemoteHandle.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { KernelStore } from '../store/index.ts';
-import { parseRef } from '../store/utils/parse-ref.ts';
-import type { Message, RRef } from '../types.ts';
-import type { RemoteComms } from './types.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import type { KernelStore } from '../../store/index.ts';
+import { parseRef } from '../../store/utils/parse-ref.ts';
+import type { Message, RRef } from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 let mockKernelStore: KernelStore;
 let mockRemoteComms: RemoteComms;

packages/ocap-kernel/src/remotes/RemoteHandle.ts → packages/ocap-kernel/src/remotes/kernel/RemoteHandle.ts

@@ -7,17 +7,17 @@ import {
   performDropImports,
   performRetireImports,
   performExportCleanup,
-} from '../garbage-collection/gc-handlers.ts';
-import type { KernelQueue } from '../KernelQueue.ts';
-import type { KernelStore } from '../store/index.ts';
+} from '../../garbage-collection/gc-handlers.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import type { KernelStore } from '../../store/index.ts';
 import type {
   RemoteId,
   ERef,
   EndpointHandle,
   Message,
   CrankResults,
-} from '../types.ts';
-import type { RemoteComms } from './types.ts';
+} from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 type RemoteHandleConstructorProps = {
   remoteId: RemoteId;

packages/ocap-kernel/src/remotes/RemoteManager.test.ts → packages/ocap-kernel/src/remotes/kernel/RemoteManager.test.ts

@@ -1,14 +1,14 @@
 import { Logger } from '@metamask/logger';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
-import { makeMapKernelDatabase } from '../../test/storage.ts';
-import type { KernelQueue } from '../KernelQueue.ts';
 import * as remoteComms from './remote-comms.ts';
-import type { RemoteComms } from './types.ts';
-import { makeKernelStore } from '../store/index.ts';
-import type { PlatformServices } from '../types.ts';
 import { RemoteManager } from './RemoteManager.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import { makeMapKernelDatabase } from '../../../test/storage.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import { makeKernelStore } from '../../store/index.ts';
+import type { PlatformServices } from '../../types.ts';
+import type { RemoteComms } from '../types.ts';
 
 vi.mock('./remote-comms.ts', async () => {
   const actual = await vi.importActual('./remote-comms.ts');

packages/ocap-kernel/src/remotes/RemoteManager.ts → packages/ocap-kernel/src/remotes/kernel/RemoteManager.ts

@@ -1,17 +1,17 @@
 import type { Logger } from '@metamask/logger';
 
-import type { KernelQueue } from '../KernelQueue.ts';
 import { initRemoteComms } from './remote-comms.ts';
 import { RemoteHandle } from './RemoteHandle.ts';
-import { kser } from '../liveslots/kernel-marshal.ts';
-import type { PlatformServices, RemoteId } from '../types.ts';
+import type { KernelQueue } from '../../KernelQueue.ts';
+import { kser } from '../../liveslots/kernel-marshal.ts';
+import type { KernelStore } from '../../store/index.ts';
+import type { PlatformServices, RemoteId } from '../../types.ts';
 import type {
   RemoteComms,
   RemoteMessageHandler,
   RemoteInfo,
   RemoteCommsOptions,
-} from './types.ts';
-import type { KernelStore } from '../store/index.ts';
+} from '../types.ts';
 
 type RemoteManagerConstructorProps = {
   platformServices: PlatformServices;

packages/ocap-kernel/src/remotes/remote-comms.test.ts → packages/ocap-kernel/src/remotes/kernel/remote-comms.test.ts

@@ -9,10 +9,10 @@ import {
   parseOcapURL,
   getKnownRelays,
 } from './remote-comms.ts';
-import { createMockRemotesFactory } from '../../test/remotes-mocks.ts';
-import type { KernelStore } from '../store/index.ts';
-import type { PlatformServices } from '../types.ts';
-import type { RemoteMessageHandler } from './types.ts';
+import { createMockRemotesFactory } from '../../../test/remotes-mocks.ts';
+import type { KernelStore } from '../../store/index.ts';
+import type { PlatformServices } from '../../types.ts';
+import type { RemoteMessageHandler } from '../types.ts';
 
 describe('remote-comms', () => {
   let mockKernelStore: KernelStore;