Skip to content

armgit / laya

Public Imported from GitHub
0

Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.

fix(ts): avoid regex backtracking in web provider URLs

xp885b2732cfb0
diff --git a/laya-ts/src/providers.ts b/laya-ts/src/providers.ts
index b3abd6e4..fd614c87 100644
--- a/laya-ts/src/providers.ts
+++ b/laya-ts/src/providers.ts
@@ -416,10 +416,19 @@ export interface WebBundle {
revision: string | null;
}
+// Scanning from the ends avoids quadratic backtracking over interior slash runs.
+function trimSlashes(value: string, leading = false): string {
+ let start = 0;
+ let end = value.length;
+ if (leading) while (start < end && value[start] === "/") start++;
+ while (end > start && value[end - 1] === "/") end--;
+ return value.slice(start, end);
+}
+
function baseUrlFor(repoOrUrl: string, subfolder?: string | null, revision?: string | null): string {
- const sub = subfolder ? `/${subfolder.replace(/^\/+|\/+$/g, "")}` : "";
+ const sub = subfolder ? `/${trimSlashes(subfolder, true)}` : "";
if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(repoOrUrl)) {
- return `${repoOrUrl.replace(/\/+$/, "")}${sub}`;
+ return `${trimSlashes(repoOrUrl)}${sub}`;
}
return `https://huggingface.co/${repoOrUrl}/resolve/${revision ?? "main"}${sub}`;
}
@@ -571,7 +580,7 @@ export async function createNodeProvider(
/** Best-effort fetch of a `<model>.data` sidecar; null when the model is single-file. */
async function fetchSidecar(url: string): Promise<{ path: string; data: Uint8Array } | null> {
const name = `${url.split("/").pop()}.data`;
- const sidecarUrl = `${url.replace(/\/+$/, "").split("/").slice(0, -1).join("/")}/${name}`;
+ const sidecarUrl = `${trimSlashes(url).split("/").slice(0, -1).join("/")}/${name}`;
try {
const buf = await fetchArrayBuffer(sidecarUrl);
return { path: name, data: new Uint8Array(buf) };
@@ -587,7 +596,7 @@ export async function createWebProvider(
const spec = "onnxruntime-" + "web";
const ort: any = await import(/* @vite-ignore */ spec);
applyNumThreads(ort, opts?.numThreads);
- const base = modelUrl.replace(/\/+$/, "");
+ const base = trimSlashes(modelUrl);
const encUrl = `${base}/encoder.onnx`;
const headUrl = `${base}/head.onnx`;
// (Re-)read through fetchArrayBuffer so repeat reads hit CacheStorage.
diff --git a/laya-ts/tests/web-provider.test.ts b/laya-ts/tests/web-provider.test.ts
index 200707e6..7e374dc1 100644
--- a/laya-ts/tests/web-provider.test.ts
+++ b/laya-ts/tests/web-provider.test.ts
@@ -14,7 +14,7 @@ vi.mock("onnxruntime-web", () => ({
InferenceSession: { create: (...args: unknown[]) => ortMocks.create(...args) },
}));
-import { createWebProvider } from "../src/providers.js";
+import { createWebProvider, loadWebBundle } from "../src/providers.js";
const batch: any = {
inputIds: [[1]],
@@ -91,3 +91,68 @@ describe("web provider external data", () => {
expect(encFetches()).toBe(2);
});
});
+
+describe("web provider URL slashes", () => {
+ function stubFiles() {
+ const fetchMock = vi.fn(async (_url: string) => ({
+ ok: true,
+ status: 200,
+ arrayBuffer: async () => new TextEncoder().encode("{}").buffer,
+ }));
+ vi.stubGlobal("fetch", fetchMock);
+ ortMocks.create.mockResolvedValue({ run: async () => ({}) });
+ return fetchMock;
+ }
+
+ it.each([
+ ["https://example.com/m///", "/v1//child///", "https://example.com/m/v1//child"],
+ ["https://example.com/m", "", "https://example.com/m"],
+ ["https://example.com/m", null, "https://example.com/m"],
+ ["https://example.com/m///", "///", "https://example.com/m/"],
+ ["https://example.com/m/\n", "/sub/\n", "https://example.com/m/\n/sub/\n"],
+ ["https://example.com/m", "/∕sub\\///", "https://example.com/m/∕sub\\"],
+ ["owner/model", "/v1//child///", "https://huggingface.co/owner/model/resolve/pinned/v1//child"],
+ ["owner/model", "///", "https://huggingface.co/owner/model/resolve/pinned/"],
+ ])("keeps bundle URL semantics for %s and subfolder %s", async (repo, subfolder, base) => {
+ const fetchMock = stubFiles();
+ const bundle = await loadWebBundle(repo!, { subfolder, revision: "pinned" });
+ expect(bundle.dir).toBe(base);
+ expect(fetchMock.mock.calls.map(call => call[0])).toEqual([
+ `${base}/rl_agent_config.json`, `${base}/tokenizer.json`,
+ ]);
+ });
+
+ it.each([
+ ["https://example.com/m///", "https://example.com/m"],
+ ["//example.com/a//b///", "//example.com/a//b"],
+ ["", ""],
+ ["///", ""],
+ ["https://example.com/m/\n", "https://example.com/m/\n"],
+ ["https://example.com/m∕\\///", "https://example.com/m∕\\"],
+ ])("keeps model and sidecar paths for %s", async (url, base) => {
+ const fetchMock = stubFiles();
+ await createWebProvider(url);
+ expect(fetchMock.mock.calls.map(call => call[0])).toEqual([
+ `${base}/encoder.onnx`, `${base}/encoder.onnx.data`,
+ `${base}/head.onnx`, `${base}/head.onnx.data`,
+ ]);
+ expect(ortMocks.create.mock.calls.map(call => call[1].externalData[0].path))
+ .toEqual(["encoder.onnx.data", "head.onnx.data"]);
+ });
+
+ it("handles long interior slash runs before a non-slash suffix", async () => {
+ const fetchMock = stubFiles();
+ const slashes = "/".repeat(100_000);
+ const repo = `https://example.com/${slashes}model`;
+ const subfolder = `${slashes}sub${slashes}leaf${slashes}`;
+ const base = `${repo}/sub${slashes}leaf`;
+ const bundle = await loadWebBundle(`${repo}${slashes}`, { subfolder });
+ expect(bundle.dir).toBe(base);
+ await createWebProvider(`${base}${slashes}`);
+ expect(fetchMock.mock.calls.map(call => call[0])).toEqual([
+ `${base}/rl_agent_config.json`, `${base}/tokenizer.json`,
+ `${base}/encoder.onnx`, `${base}/encoder.onnx.data`,
+ `${base}/head.onnx`, `${base}/head.onnx.data`,
+ ]);
+ });
+});