Skip to content

feat: Add rpc-methods package #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rekmarks merged 10 commits into from
Apr 9, 2025
Merged

feat: Add rpc-methods package #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b695ef
feat: Add rpc-methods package
rekmarks Mar 5, 2025
9f61fcb
chore(rpc-methods): Fix tsconfig.build.json
rekmarks Mar 8, 2025
d5e681e
refactor(rpc-methods): Improve type safety and overhaul types
rekmarks Apr 5, 2025
029c174
chore: Fix deps
rekmarks Apr 5, 2025
6e878bc
refactor(extension): Replace CommandRegistry with RpcService
rekmarks Apr 7, 2025
b530ba9
refactor(rpc-methods): Force all implementations to be async
rekmarks Apr 7, 2025
db4fca1
test(extension): Fix tests
rekmarks Apr 7, 2025
505aed9
refactor(extension): Replace MessageResolver with RpcClient
rekmarks Apr 8, 2025
20d0c50
refactor(rpc-methods): Remove some extraneous types
rekmarks Apr 8, 2025
c9011db
fix(rpc-methods): Fix broken import in test file
rekmarks Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ const config = createConfig([
},
},

{
files: ['**/test/**/*', '**/*.test.ts', '**/*.test.tsx'],
rules: {
'@typescript-eslint/explicit-function-return-type': 'off',
},
},
Comment on lines +132 to +137
Copy link
Member Author

@rekmarks rekmarks Apr 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incidental change: This is a common pattern in our tests that is completely fine.


{
files: ['**/*.types.test.ts'],
rules: {
Expand Down
3 changes: 0 additions & 3 deletions packages/cli/test/bundles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export const invalidTestBundleNames = ['bad-vat.fails'];

const testRoot = new URL('.', import.meta.url).pathname;

// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
const makeTestBundleRoot = async () => {
const stageRoot = resolve(tmpdir(), 'test');

Expand All @@ -32,7 +31,6 @@ const makeTestBundleRoot = async () => {
return stageBundleRoot;
};

// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
export const makeTestBundleStage = async () => {
const stageBundleRoot = await makeTestBundleRoot();

Expand All @@ -44,7 +42,6 @@ export const makeTestBundleStage = async () => {
return join(stageBundleRoot, `${bundleName}.js`);
};

// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
const getTestBundleSpecs = (testBundleNames: string[]) =>
testBundleNames.map((bundleName) => ({
name: bundleName,
Expand Down
1 change: 0 additions & 1 deletion packages/cli/test/integration/serve.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ describe('serve', async () => {
});

describe('server', () => {
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
const makeServer = (root: string = testBundleRoot) => {
const port = getServerPort();
const { listen } = getServer({
Expand Down
8 changes: 2 additions & 6 deletions packages/create-package/src/cli.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ describe('create-package/cli', () => {
tsConfig: {},
tsConfigBuild: {},
nodeVersions: '>=18.0.0',
// TODO: Replace `any` with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any);
} as utils.MonorepoFileData);
vi.spyOn(utils, 'finalizeAndWriteData').mockResolvedValue();

expect(
Expand All @@ -100,9 +98,7 @@ describe('create-package/cli', () => {
tsConfig: {},
tsConfigBuild: {},
nodeVersions: '>=18.0.0',
// TODO: Replace `any` with type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} as any);
} as utils.MonorepoFileData);
vi.spyOn(utils, 'finalizeAndWriteData').mockResolvedValue();

expect(
Expand Down
1 change: 1 addition & 0 deletions packages/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"@metamask/utils": "^11.4.0",
"@ocap/errors": "workspace:^",
"@ocap/kernel": "workspace:^",
"@ocap/rpc-methods": "workspace:^",
"@ocap/shims": "workspace:^",
"@ocap/store": "workspace:^",
"@ocap/streams": "workspace:^",
Expand Down
5 changes: 1 addition & 4 deletions packages/extension/src/kernel-integration/VatWorkerClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { makePromiseKit } from '@endo/promise-kit';
import type { PromiseKit } from '@endo/promise-kit';
import { isObject } from '@metamask/utils';
import {
isVatCommandReply,
Expand All @@ -24,15 +23,13 @@ import type {
PostMessageEnvelope,
PostMessageTarget,
} from '@ocap/streams/browser';
import type { Logger } from '@ocap/utils';
import type { Logger, PromiseCallbacks } from '@ocap/utils';
import { makeCounter, makeLogger } from '@ocap/utils';

// Appears in the docs.
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import type { ExtensionVatWorkerServer } from './VatWorkerServer.ts';

type PromiseCallbacks<Resolve = unknown> = Omit<PromiseKit<Resolve>, 'promise'>;

export type VatWorkerClientStream = PostMessageDuplexStream<
MessageEvent<VatWorkerServiceReply>,
PostMessageEnvelope<VatWorkerServiceCommand>
Expand Down
275 changes: 0 additions & 275 deletions packages/extension/src/kernel-integration/command-registry.test.ts
View file
Open in desktop

This file was deleted.

Loading
Loading