vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 05:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(gateway): avoid jiti on native plugin loads

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-04 06:02:13 +01:00
parent 3d0563dee2
commit 705bde4594
5 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/plugin-module-loader-cache.test.ts
View File

@@ -1,5 +1,6 @@
import { importFreshModule } from "openclaw/plugin-sdk/test-fixtures";
import { afterEach, describe, expect, it, vi } from "vitest";
import type { PluginModuleLoaderFactory } from "./plugin-module-loader-cache.js";
afterEach(() => {
vi.restoreAllMocks();
@@ -22,7 +23,17 @@ async function loadCachedPluginModuleLoader(scope: string) {
typeof import("./plugin-module-loader-cache.js")
>(import.meta.url, `./plugin-module-loader-cache.js?scope=${scope}`);
return { createJiti, getCachedPluginModuleLoader };
const getCachedPluginModuleLoaderWithMock: typeof getCachedPluginModuleLoader = (params) =>
getCachedPluginModuleLoader({
...params,
createLoader: params.createLoader ?? asPluginModuleLoaderFactory(createJiti),
});
return { createJiti, getCachedPluginModuleLoader: getCachedPluginModuleLoaderWithMock };
}
function asPluginModuleLoaderFactory(factory: unknown): PluginModuleLoaderFactory {
return factory as PluginModuleLoaderFactory;
}
describe("getCachedPluginModuleLoader", () => {
@@ -361,7 +372,8 @@ describe("getCachedPluginModuleLoader", () => {
it("serves compiled .js targets from native require without invoking the module loader", async () => {
const fromSourceTransformer = vi.fn();
const createJiti = vi.fn(() => fromSourceTransformer);
vi.doMock("jiti", () => ({ createJiti }));
const jitiModuleFactory = vi.fn(() => ({ createJiti }));
vi.doMock("jiti", jitiModuleFactory);
const nativeStub = vi.fn((target: string) => ({
ok: true as const,
moduleExport: { loadedFrom: target },
@@ -381,12 +393,14 @@ describe("getCachedPluginModuleLoader", () => {
modulePath: "/repo/dist/extensions/demo/api.js",
importerUrl: "file:///repo/src/plugins/public-surface-loader.ts",
loaderFilename: "file:///repo/src/plugins/public-surface-loader.ts",
createLoader: asPluginModuleLoaderFactory(createJiti),
});
const result = loader("/repo/dist/extensions/demo/api.js") as { loadedFrom: string };
expect(result.loadedFrom).toBe("/repo/dist/extensions/demo/api.js");
// Jiti should not be constructed or invoked for .js targets that
// `tryNativeRequireJavaScriptModule` resolves.
expect(jitiModuleFactory).not.toHaveBeenCalled();
expect(createJiti).not.toHaveBeenCalled();
expect(fromSourceTransformer).not.toHaveBeenCalled();
// allowWindows must be passed so the native fast path works on Windows too.
@@ -420,6 +434,7 @@ describe("getCachedPluginModuleLoader", () => {
modulePath: "/repo/dist/extensions/demo/api.js",
importerUrl: "file:///repo/src/plugins/public-surface-loader.ts",
loaderFilename: "file:///repo/src/plugins/public-surface-loader.ts",
createLoader: asPluginModuleLoaderFactory(createJiti),
});
const result = loader("/repo/dist/extensions/demo/api.js") as { fromSourceTransform: boolean };
@@ -455,6 +470,7 @@ describe("getCachedPluginModuleLoader", () => {
importerUrl: "file:///C:/Users/alice/openclaw/dist/src/plugins/public-surface-loader.js",
loaderFilename: "C:\\Users\\alice\\openclaw\\dist\\extensions\\feishu\\api.js",
tryNative: true,
createLoader: asPluginModuleLoaderFactory(createJiti),
});
loader("C:\\Users\\alice\\openclaw\\dist\\extensions\\feishu\\api.js");
@@ -489,6 +505,7 @@ describe("getCachedPluginModuleLoader", () => {
loaderFilename: "file:///repo/src/plugins/bundled-capability-runtime.ts",
aliasMap: { "openclaw/plugin-sdk": "/repo/shim.js" },
tryNative: false,
createLoader: asPluginModuleLoaderFactory(createJiti),
});
const result = loader("/repo/dist/extensions/demo/api.js") as { fromSourceTransform: boolean };
@@ -528,6 +545,7 @@ describe("getCachedPluginModuleLoader", () => {
importerUrl: "file:///C:/Users/alice/openclaw/src/plugins/loader.ts",
loaderFilename: "C:\\Users\\alice\\openclaw\\extensions\\feishu\\api.ts",
tryNative: false,
createLoader: asPluginModuleLoaderFactory(createJiti),
});
loader("C:\\Users\\alice\\openclaw\\extensions\\feishu\\api.ts");
@@ -560,6 +578,7 @@ describe("getCachedPluginModuleLoader", () => {
modulePath: "/repo/dist/extensions/demo/api.js",
importerUrl: "file:///repo/src/plugins/public-surface-loader.ts",
loaderFilename: "file:///repo/src/plugins/public-surface-loader.ts",
createLoader: asPluginModuleLoaderFactory(createJiti),
});
const loose = loader as unknown as (t: string, ...a: unknown[]) => unknown;