@tscircuit/eval 0.0.286 → 0.0.288
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/blob-url.js +1 -1
- package/dist/eval/index.d.ts +7 -0
- package/dist/eval/index.js +6 -6
- package/dist/lib/index.d.ts +7 -0
- package/dist/lib/index.js +47 -7
- package/dist/webworker/entrypoint.js +286 -290
- package/dist/worker.d.ts +7 -0
- package/dist/worker.js +42 -2
- package/lib/runner/setupDefaultEntrypointIfNeeded.ts +4 -3
- package/lib/shared/types.ts +7 -0
- package/lib/worker.ts +47 -1
- package/package.json +1 -1
- package/tests/example3-encoded-url.test.tsx +1 -1
- package/tests/fetch-override.test.ts +46 -0
- package/tests/fetch-proxy-validation.test.ts +97 -0
- package/tests/prioritize-default-export.test.tsx +27 -0
- package/webworker/entrypoint.ts +6 -1
- package/webworker/fetchProxy.ts +83 -0
- package/webworker/import-snippet.ts +2 -4
package/dist/worker.d.ts
CHANGED
|
@@ -17,6 +17,13 @@ interface WebWorkerConfiguration extends CircuitRunnerConfiguration {
|
|
|
17
17
|
*/
|
|
18
18
|
webWorkerUrl?: URL | string;
|
|
19
19
|
webWorkerBlobUrl?: URL | string;
|
|
20
|
+
/**
|
|
21
|
+
* Enable fetch proxy to route worker fetch requests through parent thread.
|
|
22
|
+
* Useful when running in restricted environments (like ChatGPT) where
|
|
23
|
+
* worker fetch requests are blocked.
|
|
24
|
+
* Default: false
|
|
25
|
+
*/
|
|
26
|
+
enableFetchProxy?: boolean;
|
|
20
27
|
}
|
|
21
28
|
type CircuitWebWorker = {
|
|
22
29
|
execute: (code: string) => Promise<void>;
|
package/dist/worker.js
CHANGED
|
@@ -47,7 +47,7 @@ var createCircuitWebWorker = async (configuration) => {
|
|
|
47
47
|
let workerBlobUrl = configuration.webWorkerBlobUrl ?? configuration.webWorkerUrl;
|
|
48
48
|
if (!workerBlobUrl) {
|
|
49
49
|
const cdnUrl = `https://cdn.jsdelivr.net/npm/@tscircuit/eval@${configuration.evalVersion ?? "latest"}/dist/webworker/entrypoint.js`;
|
|
50
|
-
const workerBlob = await fetch(cdnUrl).then((res) => res.blob());
|
|
50
|
+
const workerBlob = await globalThis.fetch(cdnUrl).then((res) => res.blob());
|
|
51
51
|
workerBlobUrl = URL.createObjectURL(workerBlob);
|
|
52
52
|
}
|
|
53
53
|
const rawWorker = new Worker(workerBlobUrl, { type: "module" });
|
|
@@ -66,11 +66,50 @@ var createCircuitWebWorker = async (configuration) => {
|
|
|
66
66
|
console.log("[Worker] Message in worker", event);
|
|
67
67
|
};
|
|
68
68
|
rawWorker.addEventListener("message", earlyMessageHandler);
|
|
69
|
+
rawWorker.addEventListener("message", async (event) => {
|
|
70
|
+
const data = event.data;
|
|
71
|
+
if (data?.type !== "worker_fetch") return;
|
|
72
|
+
try {
|
|
73
|
+
const response = await globalThis.fetch(data.input, data.init);
|
|
74
|
+
const body = await response.text();
|
|
75
|
+
rawWorker.postMessage({
|
|
76
|
+
type: "worker_fetch_result",
|
|
77
|
+
requestId: data.requestId,
|
|
78
|
+
success: true,
|
|
79
|
+
response: {
|
|
80
|
+
body,
|
|
81
|
+
status: response.status,
|
|
82
|
+
statusText: response.statusText,
|
|
83
|
+
headers: (() => {
|
|
84
|
+
const obj = {};
|
|
85
|
+
response.headers.forEach((value, key) => {
|
|
86
|
+
obj[key] = value;
|
|
87
|
+
});
|
|
88
|
+
return obj;
|
|
89
|
+
})()
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
} catch (err) {
|
|
93
|
+
rawWorker.postMessage({
|
|
94
|
+
type: "worker_fetch_result",
|
|
95
|
+
requestId: data.requestId,
|
|
96
|
+
success: false,
|
|
97
|
+
error: {
|
|
98
|
+
name: err.name,
|
|
99
|
+
message: err.message,
|
|
100
|
+
stack: err.stack
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
});
|
|
69
105
|
if (workerInitError) {
|
|
70
106
|
throw workerInitError;
|
|
71
107
|
}
|
|
72
108
|
const comlinkWorker = Comlink.wrap(rawWorker);
|
|
73
109
|
rawWorker.removeEventListener("message", earlyMessageHandler);
|
|
110
|
+
if (configuration.enableFetchProxy) {
|
|
111
|
+
rawWorker.postMessage({ type: "override_global_fetch" });
|
|
112
|
+
}
|
|
74
113
|
if (configuration.snippetsApiBaseUrl) {
|
|
75
114
|
await comlinkWorker.setSnippetsApiBaseUrl(configuration.snippetsApiBaseUrl);
|
|
76
115
|
}
|
|
@@ -110,6 +149,7 @@ var createCircuitWebWorker = async (configuration) => {
|
|
|
110
149
|
}
|
|
111
150
|
}
|
|
112
151
|
};
|
|
152
|
+
wrapper.__rawWorker = rawWorker;
|
|
113
153
|
globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = wrapper;
|
|
114
154
|
return wrapper;
|
|
115
155
|
};
|
|
@@ -117,4 +157,4 @@ export {
|
|
|
117
157
|
createCircuitWebWorker,
|
|
118
158
|
getImportsFromCode
|
|
119
159
|
};
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../lib/worker.ts", "../lib/utils/get-imports-from-code.ts"],
  "sourcesContent": ["import * as Comlink from \"comlink\"\nexport * from \"./utils/index\"\nimport type {\n  InternalWebWorkerApi,\n  WebWorkerConfiguration,\n  CircuitWebWorker,\n} from \"./shared/types\"\nimport type { RootCircuitEventName } from \"@tscircuit/core\"\n\nexport type { CircuitWebWorker, WebWorkerConfiguration }\n\ndeclare global {\n  interface Window {\n    TSCIRCUIT_GLOBAL_CIRCUIT_WORKER: CircuitWebWorker | undefined\n  }\n  var TSCIRCUIT_GLOBAL_CIRCUIT_WORKER: CircuitWebWorker | undefined\n}\n\nexport const createCircuitWebWorker = async (\n  configuration: Partial<WebWorkerConfiguration>,\n): Promise<CircuitWebWorker> => {\n  // Kill existing global worker instance if present\n  const existingWorker = globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER\n  if (existingWorker && typeof existingWorker.kill === \"function\") {\n    if (configuration.verbose) {\n      console.log(\"[Worker] Killing previous global worker instance...\")\n    }\n    try {\n      await existingWorker.kill()\n    } catch (e) {\n      if (configuration.verbose) {\n        console.warn(\n          \"[Worker] Error killing previous global worker instance:\",\n          e,\n        )\n      }\n      // Ensure the key is cleared even if kill throws an error\n      if (globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER === existingWorker) {\n        globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = undefined\n      }\n    }\n  }\n\n  if (configuration.verbose) {\n    console.log(\n      \"[Worker] Creating circuit web worker with config:\",\n      configuration,\n    )\n  }\n\n  let workerBlobUrl =\n    configuration.webWorkerBlobUrl ?? configuration.webWorkerUrl\n\n  if (!workerBlobUrl) {\n    const cdnUrl = `https://cdn.jsdelivr.net/npm/@tscircuit/eval@${configuration.evalVersion ?? \"latest\"}/dist/webworker/entrypoint.js`\n\n    const workerBlob = await fetch(cdnUrl).then((res) => res.blob())\n    workerBlobUrl = URL.createObjectURL(workerBlob)\n  }\n\n  const rawWorker = new Worker(workerBlobUrl, { type: \"module\" })\n  let workerInitError: any\n  rawWorker.addEventListener(\"error\", (event) => {\n    console.error(\"[Worker] Error in worker\", event)\n    workerInitError = event\n  })\n  rawWorker.addEventListener(\"unhandledrejection\", (event) => {\n    console.error(\"[Worker] Unhandled rejection in worker\", event)\n  })\n  rawWorker.addEventListener(\"messageerror\", (event) => {\n    console.error(\"[Worker] Message error in worker\", event)\n  })\n  const earlyMessageHandler = (event: MessageEvent) => {\n    console.log(\"[Worker] Message in worker\", event)\n  }\n  rawWorker.addEventListener(\"message\", earlyMessageHandler)\n\n  if (workerInitError) {\n    throw workerInitError\n  }\n\n  const comlinkWorker = Comlink.wrap<InternalWebWorkerApi>(rawWorker)\n\n  rawWorker.removeEventListener(\"message\", earlyMessageHandler)\n\n  if (configuration.snippetsApiBaseUrl) {\n    await comlinkWorker.setSnippetsApiBaseUrl(configuration.snippetsApiBaseUrl)\n  }\n  if (configuration.platform) {\n    await comlinkWorker.setPlatformConfig(configuration.platform)\n  }\n\n  let isTerminated = false\n\n  // Create a wrapper that handles events directly through circuit instance\n  const wrapper: CircuitWebWorker = {\n    clearEventListeners: comlinkWorker.clearEventListeners.bind(comlinkWorker),\n    version: comlinkWorker.version.bind(comlinkWorker),\n    execute: async (...args) => {\n      if (isTerminated) {\n        throw new Error(\"CircuitWebWorker was terminated, can't execute\")\n      }\n      return comlinkWorker.execute.bind(comlinkWorker)(...args)\n    },\n    executeWithFsMap: async (...args) => {\n      if (isTerminated) {\n        throw new Error(\n          \"CircuitWebWorker was terminated, can't executeWithFsMap\",\n        )\n      }\n      return comlinkWorker.executeWithFsMap.bind(comlinkWorker)(...args)\n    },\n    renderUntilSettled: comlinkWorker.renderUntilSettled.bind(comlinkWorker),\n    getCircuitJson: comlinkWorker.getCircuitJson.bind(comlinkWorker),\n    on: (event: string, callback: (...args: any[]) => void) => {\n      const proxiedCallback = Comlink.proxy(callback)\n      comlinkWorker.on(event as RootCircuitEventName, proxiedCallback)\n    },\n    kill: async () => {\n      comlinkWorker[Comlink.releaseProxy]()\n      rawWorker.terminate()\n      isTerminated = true\n      if (globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER === wrapper) {\n        globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = undefined\n      }\n    },\n  }\n  globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = wrapper\n  return wrapper\n}\n", "export const getImportsFromCode = (code: string): string[] => {\n  // Match basic import patterns including combined default and namespace imports\n  const importRegex =\n    /^\\s*import\\s+(?:(?:[\\w\\s]+,\\s*)?(?:\\*\\s+as\\s+[\\w\\s]+|\\{[\\s\\w,]+\\}|\\w+)\\s+from\\s+)?['\"](.+?)['\"]/gm\n  const imports: string[] = []\n  let match: RegExpExecArray | null\n\n  // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>\n  while ((match = importRegex.exec(code)) !== null) {\n    imports.push(match[1])\n  }\n\n  // Match re-exports\n  const reExportRegex =\n    /^\\s*export\\s+(?:\\*|(?:\\{[\\s\\w,]+\\}))\\s+from\\s+['\"](.+?)['\"]/gm\n  let reExportMatch: RegExpExecArray | null\n  // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>\n  while ((reExportMatch = reExportRegex.exec(code)) !== null) {\n    imports.push(reExportMatch[1])\n  }\n\n  return imports\n}\n"],
  "mappings": "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",
  "names": []
}

|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../lib/worker.ts", "../lib/utils/get-imports-from-code.ts"],
  "sourcesContent": ["import * as Comlink from \"comlink\"\nexport * from \"./utils/index\"\nimport type {\n  InternalWebWorkerApi,\n  WebWorkerConfiguration,\n  CircuitWebWorker,\n} from \"./shared/types\"\nimport type { RootCircuitEventName } from \"@tscircuit/core\"\n\nexport type { CircuitWebWorker, WebWorkerConfiguration }\n\ndeclare global {\n  interface Window {\n    TSCIRCUIT_GLOBAL_CIRCUIT_WORKER: CircuitWebWorker | undefined\n  }\n  var TSCIRCUIT_GLOBAL_CIRCUIT_WORKER: CircuitWebWorker | undefined\n}\n\nexport const createCircuitWebWorker = async (\n  configuration: Partial<WebWorkerConfiguration>,\n): Promise<CircuitWebWorker> => {\n  // Kill existing global worker instance if present\n  const existingWorker = globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER\n  if (existingWorker && typeof existingWorker.kill === \"function\") {\n    if (configuration.verbose) {\n      console.log(\"[Worker] Killing previous global worker instance...\")\n    }\n    try {\n      await existingWorker.kill()\n    } catch (e) {\n      if (configuration.verbose) {\n        console.warn(\n          \"[Worker] Error killing previous global worker instance:\",\n          e,\n        )\n      }\n      // Ensure the key is cleared even if kill throws an error\n      if (globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER === existingWorker) {\n        globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = undefined\n      }\n    }\n  }\n\n  if (configuration.verbose) {\n    console.log(\n      \"[Worker] Creating circuit web worker with config:\",\n      configuration,\n    )\n  }\n\n  let workerBlobUrl =\n    configuration.webWorkerBlobUrl ?? configuration.webWorkerUrl\n\n  if (!workerBlobUrl) {\n    const cdnUrl = `https://cdn.jsdelivr.net/npm/@tscircuit/eval@${configuration.evalVersion ?? \"latest\"}/dist/webworker/entrypoint.js`\n\n    const workerBlob = await globalThis.fetch(cdnUrl).then((res) => res.blob())\n    workerBlobUrl = URL.createObjectURL(workerBlob)\n  }\n\n  const rawWorker = new Worker(workerBlobUrl, { type: \"module\" })\n  let workerInitError: any\n  rawWorker.addEventListener(\"error\", (event) => {\n    console.error(\"[Worker] Error in worker\", event)\n    workerInitError = event\n  })\n  rawWorker.addEventListener(\"unhandledrejection\", (event) => {\n    console.error(\"[Worker] Unhandled rejection in worker\", event)\n  })\n  rawWorker.addEventListener(\"messageerror\", (event) => {\n    console.error(\"[Worker] Message error in worker\", event)\n  })\n  const earlyMessageHandler = (event: MessageEvent) => {\n    console.log(\"[Worker] Message in worker\", event)\n  }\n  rawWorker.addEventListener(\"message\", earlyMessageHandler)\n\n  // Handle fetch requests from the worker\n  rawWorker.addEventListener(\"message\", async (event: MessageEvent) => {\n    const data = event.data\n    if (data?.type !== \"worker_fetch\") return\n\n    try {\n      const response = await globalThis.fetch(data.input, data.init)\n      const body = await response.text()\n      rawWorker.postMessage({\n        type: \"worker_fetch_result\",\n        requestId: data.requestId,\n        success: true,\n        response: {\n          body,\n          status: response.status,\n          statusText: response.statusText,\n          headers: (() => {\n            const obj: Record<string, string> = {}\n            response.headers.forEach((value, key) => {\n              obj[key] = value\n            })\n            return obj\n          })(),\n        },\n      })\n    } catch (err: any) {\n      rawWorker.postMessage({\n        type: \"worker_fetch_result\",\n        requestId: data.requestId,\n        success: false,\n        error: {\n          name: err.name,\n          message: err.message,\n          stack: err.stack,\n        },\n      })\n    }\n  })\n\n  if (workerInitError) {\n    throw workerInitError\n  }\n\n  const comlinkWorker = Comlink.wrap<InternalWebWorkerApi>(rawWorker)\n\n  rawWorker.removeEventListener(\"message\", earlyMessageHandler)\n\n  // Conditionally override global fetch inside the worker to route through the parent\n  // Only enable when explicitly requested via configuration\n  if (configuration.enableFetchProxy) {\n    rawWorker.postMessage({ type: \"override_global_fetch\" })\n  }\n\n  if (configuration.snippetsApiBaseUrl) {\n    await comlinkWorker.setSnippetsApiBaseUrl(configuration.snippetsApiBaseUrl)\n  }\n  if (configuration.platform) {\n    await comlinkWorker.setPlatformConfig(configuration.platform)\n  }\n\n  let isTerminated = false\n\n  // Create a wrapper that handles events directly through circuit instance\n  const wrapper: CircuitWebWorker = {\n    clearEventListeners: comlinkWorker.clearEventListeners.bind(comlinkWorker),\n    version: comlinkWorker.version.bind(comlinkWorker),\n    execute: async (...args) => {\n      if (isTerminated) {\n        throw new Error(\"CircuitWebWorker was terminated, can't execute\")\n      }\n      return comlinkWorker.execute.bind(comlinkWorker)(...args)\n    },\n    executeWithFsMap: async (...args) => {\n      if (isTerminated) {\n        throw new Error(\n          \"CircuitWebWorker was terminated, can't executeWithFsMap\",\n        )\n      }\n      return comlinkWorker.executeWithFsMap.bind(comlinkWorker)(...args)\n    },\n    renderUntilSettled: comlinkWorker.renderUntilSettled.bind(comlinkWorker),\n    getCircuitJson: comlinkWorker.getCircuitJson.bind(comlinkWorker),\n    on: (event: string, callback: (...args: any[]) => void) => {\n      const proxiedCallback = Comlink.proxy(callback)\n      comlinkWorker.on(event as RootCircuitEventName, proxiedCallback)\n    },\n    kill: async () => {\n      comlinkWorker[Comlink.releaseProxy]()\n      rawWorker.terminate()\n      isTerminated = true\n      if (globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER === wrapper) {\n        globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = undefined\n      }\n    },\n  }\n  ;(wrapper as any).__rawWorker = rawWorker\n  globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = wrapper\n  return wrapper\n}\n", "export const getImportsFromCode = (code: string): string[] => {\n  // Match basic import patterns including combined default and namespace imports\n  const importRegex =\n    /^\\s*import\\s+(?:(?:[\\w\\s]+,\\s*)?(?:\\*\\s+as\\s+[\\w\\s]+|\\{[\\s\\w,]+\\}|\\w+)\\s+from\\s+)?['\"](.+?)['\"]/gm\n  const imports: string[] = []\n  let match: RegExpExecArray | null\n\n  // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>\n  while ((match = importRegex.exec(code)) !== null) {\n    imports.push(match[1])\n  }\n\n  // Match re-exports\n  const reExportRegex =\n    /^\\s*export\\s+(?:\\*|(?:\\{[\\s\\w,]+\\}))\\s+from\\s+['\"](.+?)['\"]/gm\n  let reExportMatch: RegExpExecArray | null\n  // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>\n  while ((reExportMatch = reExportRegex.exec(code)) !== null) {\n    imports.push(reExportMatch[1])\n  }\n\n  return imports\n}\n"],
  "mappings": "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",
  "names": []
}

|
|
@@ -54,9 +54,10 @@ export const setupDefaultEntrypointIfNeeded = (opts: {
|
|
|
54
54
|
? `
|
|
55
55
|
const ComponentToRender = UserComponents["${opts.mainComponentName}"]
|
|
56
56
|
`
|
|
57
|
-
: `const ComponentToRender =
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
: `const ComponentToRender = UserComponents.default ||
|
|
58
|
+
Object.entries(UserComponents)
|
|
59
|
+
.filter(([name]) => !name.startsWith("use"))
|
|
60
|
+
.map(([_, component]) => component)[0] || (() => null);`
|
|
60
61
|
}
|
|
61
62
|
|
|
62
63
|
${
|
package/lib/shared/types.ts
CHANGED
|
@@ -16,6 +16,13 @@ export interface WebWorkerConfiguration extends CircuitRunnerConfiguration {
|
|
|
16
16
|
*/
|
|
17
17
|
webWorkerUrl?: URL | string
|
|
18
18
|
webWorkerBlobUrl?: URL | string
|
|
19
|
+
/**
|
|
20
|
+
* Enable fetch proxy to route worker fetch requests through parent thread.
|
|
21
|
+
* Useful when running in restricted environments (like ChatGPT) where
|
|
22
|
+
* worker fetch requests are blocked.
|
|
23
|
+
* Default: false
|
|
24
|
+
*/
|
|
25
|
+
enableFetchProxy?: boolean
|
|
19
26
|
}
|
|
20
27
|
|
|
21
28
|
/**
|
package/lib/worker.ts
CHANGED
|
@@ -54,7 +54,7 @@ export const createCircuitWebWorker = async (
|
|
|
54
54
|
if (!workerBlobUrl) {
|
|
55
55
|
const cdnUrl = `https://cdn.jsdelivr.net/npm/@tscircuit/eval@${configuration.evalVersion ?? "latest"}/dist/webworker/entrypoint.js`
|
|
56
56
|
|
|
57
|
-
const workerBlob = await fetch(cdnUrl).then((res) => res.blob())
|
|
57
|
+
const workerBlob = await globalThis.fetch(cdnUrl).then((res) => res.blob())
|
|
58
58
|
workerBlobUrl = URL.createObjectURL(workerBlob)
|
|
59
59
|
}
|
|
60
60
|
|
|
@@ -75,6 +75,45 @@ export const createCircuitWebWorker = async (
|
|
|
75
75
|
}
|
|
76
76
|
rawWorker.addEventListener("message", earlyMessageHandler)
|
|
77
77
|
|
|
78
|
+
// Handle fetch requests from the worker
|
|
79
|
+
rawWorker.addEventListener("message", async (event: MessageEvent) => {
|
|
80
|
+
const data = event.data
|
|
81
|
+
if (data?.type !== "worker_fetch") return
|
|
82
|
+
|
|
83
|
+
try {
|
|
84
|
+
const response = await globalThis.fetch(data.input, data.init)
|
|
85
|
+
const body = await response.text()
|
|
86
|
+
rawWorker.postMessage({
|
|
87
|
+
type: "worker_fetch_result",
|
|
88
|
+
requestId: data.requestId,
|
|
89
|
+
success: true,
|
|
90
|
+
response: {
|
|
91
|
+
body,
|
|
92
|
+
status: response.status,
|
|
93
|
+
statusText: response.statusText,
|
|
94
|
+
headers: (() => {
|
|
95
|
+
const obj: Record<string, string> = {}
|
|
96
|
+
response.headers.forEach((value, key) => {
|
|
97
|
+
obj[key] = value
|
|
98
|
+
})
|
|
99
|
+
return obj
|
|
100
|
+
})(),
|
|
101
|
+
},
|
|
102
|
+
})
|
|
103
|
+
} catch (err: any) {
|
|
104
|
+
rawWorker.postMessage({
|
|
105
|
+
type: "worker_fetch_result",
|
|
106
|
+
requestId: data.requestId,
|
|
107
|
+
success: false,
|
|
108
|
+
error: {
|
|
109
|
+
name: err.name,
|
|
110
|
+
message: err.message,
|
|
111
|
+
stack: err.stack,
|
|
112
|
+
},
|
|
113
|
+
})
|
|
114
|
+
}
|
|
115
|
+
})
|
|
116
|
+
|
|
78
117
|
if (workerInitError) {
|
|
79
118
|
throw workerInitError
|
|
80
119
|
}
|
|
@@ -83,6 +122,12 @@ export const createCircuitWebWorker = async (
|
|
|
83
122
|
|
|
84
123
|
rawWorker.removeEventListener("message", earlyMessageHandler)
|
|
85
124
|
|
|
125
|
+
// Conditionally override global fetch inside the worker to route through the parent
|
|
126
|
+
// Only enable when explicitly requested via configuration
|
|
127
|
+
if (configuration.enableFetchProxy) {
|
|
128
|
+
rawWorker.postMessage({ type: "override_global_fetch" })
|
|
129
|
+
}
|
|
130
|
+
|
|
86
131
|
if (configuration.snippetsApiBaseUrl) {
|
|
87
132
|
await comlinkWorker.setSnippetsApiBaseUrl(configuration.snippetsApiBaseUrl)
|
|
88
133
|
}
|
|
@@ -125,6 +170,7 @@ export const createCircuitWebWorker = async (
|
|
|
125
170
|
}
|
|
126
171
|
},
|
|
127
172
|
}
|
|
173
|
+
;(wrapper as any).__rawWorker = rawWorker
|
|
128
174
|
globalThis.TSCIRCUIT_GLOBAL_CIRCUIT_WORKER = wrapper
|
|
129
175
|
return wrapper
|
|
130
176
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tscircuit/eval",
|
|
3
3
|
"main": "dist/lib/index.js",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.288",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "bun run build:lib && bun run build:webworker && bun run build:blob-url && bun run build:runner && bun run build:worker-wrapper",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createCircuitWebWorker } from "lib"
|
|
2
2
|
import { expect, test } from "bun:test"
|
|
3
3
|
// @ts-ignore
|
|
4
|
-
import blobUrl from "dist/blob-url"
|
|
4
|
+
import blobUrl from "../dist/blob-url"
|
|
5
5
|
|
|
6
6
|
test("example3-encoded-worker-url", async () => {
|
|
7
7
|
const circuitWebWorker = await createCircuitWebWorker({
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { describe, it, expect } from "bun:test"
|
|
2
|
+
import { createCircuitWebWorker } from "../lib"
|
|
3
|
+
|
|
4
|
+
describe("fetch override", () => {
|
|
5
|
+
it("allows worker to fetch via parent and propagates errors", async () => {
|
|
6
|
+
const originalFetch = globalThis.fetch
|
|
7
|
+
const fakeFetch = async (input: RequestInfo, init?: RequestInit) => {
|
|
8
|
+
if (typeof input === "string" && input.includes("cjs.tscircuit.com")) {
|
|
9
|
+
return new Response("module.exports = { default: 123 };", {
|
|
10
|
+
status: 200,
|
|
11
|
+
})
|
|
12
|
+
}
|
|
13
|
+
throw new Error("fake fail")
|
|
14
|
+
}
|
|
15
|
+
globalThis.fetch = fakeFetch as any
|
|
16
|
+
|
|
17
|
+
const worker = await createCircuitWebWorker({
|
|
18
|
+
webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
|
|
19
|
+
.href,
|
|
20
|
+
enableFetchProxy: true,
|
|
21
|
+
})
|
|
22
|
+
|
|
23
|
+
const rawWorker: Worker = (worker as any).__rawWorker
|
|
24
|
+
const messages: any[] = []
|
|
25
|
+
rawWorker.addEventListener("message", (event) => {
|
|
26
|
+
if (event.data?.type === "fetch_error") messages.push(event.data)
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
await worker.execute(`
|
|
30
|
+
import val from "@tsci/test.snippet";
|
|
31
|
+
if (val !== 123) { throw new Error("snippet failed"); }
|
|
32
|
+
fetch("https://fail.test").catch(e => {
|
|
33
|
+
postMessage({ type: "fetch_error", name: e.name, message: e.message });
|
|
34
|
+
});
|
|
35
|
+
`)
|
|
36
|
+
|
|
37
|
+
await new Promise((r) => setTimeout(r, 10))
|
|
38
|
+
|
|
39
|
+
expect(messages).toEqual([
|
|
40
|
+
{ type: "fetch_error", name: "Error", message: "fake fail" },
|
|
41
|
+
])
|
|
42
|
+
|
|
43
|
+
await worker.kill()
|
|
44
|
+
globalThis.fetch = originalFetch
|
|
45
|
+
})
|
|
46
|
+
})
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { describe, it, expect } from "bun:test"
|
|
2
|
+
import { createCircuitWebWorker } from "../lib"
|
|
3
|
+
|
|
4
|
+
describe("fetch proxy validation", () => {
|
|
5
|
+
it("should NOT proxy fetch requests when enableFetchProxy is false (default)", async () => {
|
|
6
|
+
const worker = await createCircuitWebWorker({
|
|
7
|
+
webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
|
|
8
|
+
.href,
|
|
9
|
+
// enableFetchProxy not set, should default to false
|
|
10
|
+
})
|
|
11
|
+
|
|
12
|
+
const rawWorker: Worker = (worker as any).__rawWorker
|
|
13
|
+
const messages: any[] = []
|
|
14
|
+
rawWorker.addEventListener("message", (event) => {
|
|
15
|
+
if (event.data?.type === "worker_fetch") messages.push(event.data)
|
|
16
|
+
})
|
|
17
|
+
|
|
18
|
+
await worker.execute(`
|
|
19
|
+
// Test that fetch calls are NOT proxied when enableFetchProxy is false
|
|
20
|
+
fetch("https://example.com/test")
|
|
21
|
+
.catch(() => {}); // Ignore errors, we just want to see if it's proxied
|
|
22
|
+
`)
|
|
23
|
+
|
|
24
|
+
await new Promise((r) => setTimeout(r, 100))
|
|
25
|
+
|
|
26
|
+
// Should NOT have received any worker_fetch messages
|
|
27
|
+
expect(messages.length).toBe(0)
|
|
28
|
+
|
|
29
|
+
await worker.kill()
|
|
30
|
+
})
|
|
31
|
+
|
|
32
|
+
it("should proxy fetch requests when enableFetchProxy is true", async () => {
|
|
33
|
+
const worker = await createCircuitWebWorker({
|
|
34
|
+
webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
|
|
35
|
+
.href,
|
|
36
|
+
enableFetchProxy: true,
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
const rawWorker: Worker = (worker as any).__rawWorker
|
|
40
|
+
const messages: any[] = []
|
|
41
|
+
rawWorker.addEventListener("message", (event) => {
|
|
42
|
+
if (event.data?.type === "worker_fetch") messages.push(event.data)
|
|
43
|
+
})
|
|
44
|
+
|
|
45
|
+
await worker.execute(`
|
|
46
|
+
// Test that fetch calls are proxied when enableFetchProxy is true
|
|
47
|
+
fetch("https://example.com/test")
|
|
48
|
+
.catch(() => {}); // Ignore errors, we just want to see if it's proxied
|
|
49
|
+
`)
|
|
50
|
+
|
|
51
|
+
await new Promise((r) => setTimeout(r, 100))
|
|
52
|
+
|
|
53
|
+
// Should have received a worker_fetch message indicating the proxy is working
|
|
54
|
+
expect(messages.length).toBeGreaterThan(0)
|
|
55
|
+
expect(messages[0].type).toBe("worker_fetch")
|
|
56
|
+
expect(messages[0].input).toBe("https://example.com/test")
|
|
57
|
+
|
|
58
|
+
await worker.kill()
|
|
59
|
+
})
|
|
60
|
+
|
|
61
|
+
it("should handle fetch errors properly through proxy when enabled", async () => {
|
|
62
|
+
// This test verifies that the fetch proxy correctly handles and forwards errors
|
|
63
|
+
const originalFetch = globalThis.fetch
|
|
64
|
+
const fakeFetch = async () => {
|
|
65
|
+
throw new Error("Network error")
|
|
66
|
+
}
|
|
67
|
+
globalThis.fetch = fakeFetch as any
|
|
68
|
+
|
|
69
|
+
const worker = await createCircuitWebWorker({
|
|
70
|
+
webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
|
|
71
|
+
.href,
|
|
72
|
+
enableFetchProxy: true,
|
|
73
|
+
})
|
|
74
|
+
|
|
75
|
+
const rawWorker: Worker = (worker as any).__rawWorker
|
|
76
|
+
const messages: any[] = []
|
|
77
|
+
rawWorker.addEventListener("message", (event) => {
|
|
78
|
+
if (event.data?.type === "fetch_error") messages.push(event.data)
|
|
79
|
+
})
|
|
80
|
+
|
|
81
|
+
await worker.execute(`
|
|
82
|
+
fetch("https://example.com/test")
|
|
83
|
+
.catch(e => {
|
|
84
|
+
postMessage({ type: "fetch_error", name: e.name, message: e.message });
|
|
85
|
+
});
|
|
86
|
+
`)
|
|
87
|
+
|
|
88
|
+
await new Promise((r) => setTimeout(r, 100))
|
|
89
|
+
|
|
90
|
+
expect(messages).toEqual([
|
|
91
|
+
{ type: "fetch_error", name: "Error", message: "Network error" },
|
|
92
|
+
])
|
|
93
|
+
|
|
94
|
+
await worker.kill()
|
|
95
|
+
globalThis.fetch = originalFetch
|
|
96
|
+
})
|
|
97
|
+
})
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { runTscircuitCode } from "lib/runner"
|
|
2
|
+
import { expect, test } from "bun:test"
|
|
3
|
+
|
|
4
|
+
test("example12 subdirectory relative imports", async () => {
|
|
5
|
+
const circuitJson = await runTscircuitCode(
|
|
6
|
+
{
|
|
7
|
+
"lib/resistor.tsx": `
|
|
8
|
+
export default () => (<resistor name="R1" resistance="1k" />)
|
|
9
|
+
`,
|
|
10
|
+
"user-code.tsx": `
|
|
11
|
+
import Resistor from "./lib/resistor";
|
|
12
|
+
export default () => (<resistor name="R2" resistance="2k" />)
|
|
13
|
+
export {Resistor}
|
|
14
|
+
`,
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
mainComponentPath: "user-code",
|
|
18
|
+
},
|
|
19
|
+
)
|
|
20
|
+
|
|
21
|
+
const resistor = circuitJson.find(
|
|
22
|
+
(element) => element.type === "source_component",
|
|
23
|
+
)
|
|
24
|
+
|
|
25
|
+
expect(resistor).toBeDefined()
|
|
26
|
+
expect(resistor?.name).toBe("R2")
|
|
27
|
+
})
|
package/webworker/entrypoint.ts
CHANGED
|
@@ -14,8 +14,10 @@ import { importEvalPath } from "./import-eval-path"
|
|
|
14
14
|
import { normalizeFsMap } from "../lib/runner/normalizeFsMap"
|
|
15
15
|
import type { RootCircuit } from "@tscircuit/core"
|
|
16
16
|
import { setupDefaultEntrypointIfNeeded } from "lib/runner/setupDefaultEntrypointIfNeeded"
|
|
17
|
+
import { setupFetchProxy } from "./fetchProxy"
|
|
17
18
|
|
|
18
19
|
globalThis.React = React
|
|
20
|
+
setupFetchProxy()
|
|
19
21
|
|
|
20
22
|
let executionContext: ExecutionContext | null = null
|
|
21
23
|
|
|
@@ -124,7 +126,10 @@ const webWorkerApi = {
|
|
|
124
126
|
for (const event in eventListeners) {
|
|
125
127
|
for (const listener of eventListeners[event]) {
|
|
126
128
|
const circuit = executionContext.circuit as unknown as {
|
|
127
|
-
removeListener?: (
|
|
129
|
+
removeListener?: (
|
|
130
|
+
event: string,
|
|
131
|
+
listener: (...args: any[]) => void,
|
|
132
|
+
) => void
|
|
128
133
|
}
|
|
129
134
|
if (typeof circuit.removeListener === "function") {
|
|
130
135
|
circuit.removeListener(event, listener)
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
export const setupFetchProxy = () => {
|
|
2
|
+
const pendingRequests = new Map<
|
|
3
|
+
number,
|
|
4
|
+
{ resolve: (value: Response) => void; reject: (reason: any) => void }
|
|
5
|
+
>()
|
|
6
|
+
let requestCounter = 0
|
|
7
|
+
|
|
8
|
+
function fetchProxy(
|
|
9
|
+
input: RequestInfo | URL,
|
|
10
|
+
init?: RequestInit,
|
|
11
|
+
): Promise<Response> {
|
|
12
|
+
const requestId = ++requestCounter
|
|
13
|
+
return new Promise((resolve, reject) => {
|
|
14
|
+
pendingRequests.set(requestId, { resolve, reject })
|
|
15
|
+
let url: string
|
|
16
|
+
let requestInit: any = init ? { ...init } : {}
|
|
17
|
+
|
|
18
|
+
if (typeof input === "string" || input instanceof URL) {
|
|
19
|
+
url = input.toString()
|
|
20
|
+
} else {
|
|
21
|
+
url = input.url
|
|
22
|
+
requestInit = {
|
|
23
|
+
...requestInit,
|
|
24
|
+
method: input.method,
|
|
25
|
+
headers: (() => {
|
|
26
|
+
const obj: Record<string, string> = {}
|
|
27
|
+
input.headers.forEach((value, key) => {
|
|
28
|
+
obj[key] = value
|
|
29
|
+
})
|
|
30
|
+
return obj
|
|
31
|
+
})(),
|
|
32
|
+
body: input.bodyUsed ? undefined : (input as any).body,
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
if (requestInit.headers instanceof Headers) {
|
|
37
|
+
const obj: Record<string, string> = {}
|
|
38
|
+
requestInit.headers.forEach((value: string, key: string) => {
|
|
39
|
+
obj[key] = value
|
|
40
|
+
})
|
|
41
|
+
requestInit.headers = obj
|
|
42
|
+
}
|
|
43
|
+
;(globalThis as any).postMessage({
|
|
44
|
+
type: "worker_fetch",
|
|
45
|
+
requestId,
|
|
46
|
+
input: url,
|
|
47
|
+
init: requestInit,
|
|
48
|
+
})
|
|
49
|
+
})
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function handleMessage(event: MessageEvent) {
|
|
53
|
+
const data = event.data
|
|
54
|
+
if (!data) return
|
|
55
|
+
|
|
56
|
+
if (data.type === "override_global_fetch") {
|
|
57
|
+
;(globalThis as any).fetch = fetchProxy
|
|
58
|
+
return
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
if (data.type === "worker_fetch_result") {
|
|
62
|
+
const handlers = pendingRequests.get(data.requestId)
|
|
63
|
+
if (!handlers) return
|
|
64
|
+
pendingRequests.delete(data.requestId)
|
|
65
|
+
|
|
66
|
+
if (data.success) {
|
|
67
|
+
const resp = new Response(data.response.body, {
|
|
68
|
+
status: data.response.status,
|
|
69
|
+
statusText: data.response.statusText,
|
|
70
|
+
headers: data.response.headers,
|
|
71
|
+
})
|
|
72
|
+
handlers.resolve(resp)
|
|
73
|
+
} else {
|
|
74
|
+
const err = new Error(data.error.message)
|
|
75
|
+
if (data.error.name) err.name = data.error.name
|
|
76
|
+
if (data.error.stack) err.stack = data.error.stack
|
|
77
|
+
handlers.reject(err)
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
globalThis.addEventListener("message", handleMessage)
|
|
83
|
+
}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { evalCompiledJs } from "./eval-compiled-js"
|
|
2
2
|
import type { ExecutionContext } from "./execution-context"
|
|
3
|
-
import * as Babel from "@babel/standalone"
|
|
4
|
-
import { importLocalFile } from "./import-local-file"
|
|
5
|
-
import { importEvalPath } from "./import-eval-path"
|
|
6
3
|
|
|
7
4
|
export async function importSnippet(
|
|
8
5
|
importName: string,
|
|
@@ -12,7 +9,8 @@ export async function importSnippet(
|
|
|
12
9
|
const { preSuppliedImports } = ctx
|
|
13
10
|
const fullSnippetName = importName.replace("@tsci/", "").replace(".", "/")
|
|
14
11
|
|
|
15
|
-
const { cjs, error } = await
|
|
12
|
+
const { cjs, error } = await globalThis
|
|
13
|
+
.fetch(`${ctx.cjsRegistryUrl}/${fullSnippetName}`)
|
|
16
14
|
.then(async (res) => ({ cjs: await res.text(), error: null }))
|
|
17
15
|
.catch((e) => ({ error: e, cjs: null }))
|
|
18
16
|
|