Merge pull request #4 from subquery/fix-sandbox-config

Fix sandbox loading config via env

src/index.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S deno run --allow-env --allow-net --allow-sys --allow-read --allow-write --allow-ffi --allow-run --unstable-worker-options
+#!/usr/bin/env -S deno run --allow-env --allow-net --allow-sys --allow-read --allow-write --allow-ffi --allow-run --unstable-worker-options --no-prompt
 // TODO limit --allow-ffi to just lancedb
 // TODO limit --deny-net on localhost except ollama/db
 // TODO limit --allow-run needed for Deno.exit

src/project/project.ts

@@ -97,13 +97,14 @@ const ProjectEntrypointGen = <T extends TObject>(t: T) =>
 
 export async function getProjectFromEntrypoint(
   entrypoint: unknown,
+  providedConfig?: Record<string, string>,
 ): Promise<IProject> {
   if (!entrypoint) {
     throw new Error("Project entry is invalid");
   }
   // Validate the entrypoint
   if (validateProjectEntry(entrypoint)) {
-    const config = loadConfigFromEnv(entrypoint.configType);
+    const config = loadConfigFromEnv(entrypoint.configType, providedConfig);
 
     // Check that the constructed project is valid
     const project = await entrypoint.projectFactory(config);

src/sandbox/webWorker/messages.ts

@@ -8,7 +8,7 @@ export type IProjectJson = Omit<IProject, "tools"> & { tools: Tool[] };
 // Framework -> Sandbox
 export const Load = new rpc.RequestType<string, void, string>("load");
 export const Init = new rpc.RequestType<
-  Record<string, unknown>,
+  Record<string, string>,
   IProjectJson,
   string
 >("init");

src/sandbox/webWorker/webWorkerSandbox.ts

@@ -31,7 +31,7 @@ export class WebWorkerSandbox implements ISandbox {
         type: "module",
         deno: {
           permissions: {
-            env: true, // TODO limit this
+            env: false, // Should be passed through in loadConfigFromEnv below
             // hrtime: false,
             net: "inherit", // TODO remove localhost
             ffi: true, // Needed for node js ffi

src/util.ts

@@ -5,9 +5,10 @@ import { brightBlue } from "@std/fmt/colors";
 
 export function loadConfigFromEnv<T extends TSchema>(
   schema?: T,
+  envObj?: Record<string, string>,
 ): Static<T> | undefined {
   if (!schema) return undefined;
-  const envObj = Deno.env.toObject();
+  envObj ??= Deno.env.toObject();
   return Value.Parse(schema, envObj);
 }