fix: hostcall token issue (#1010)

Author: Yohe-Am

src/typegate/src/runtimes/deno/deno.ts

@@ -163,10 +163,7 @@ export class DenoRuntime extends Runtime {
       }
     }
 
-    const token = await InternalAuth.emit(typegate.cryptoKeys);
-
     const hostcallCtx = {
-      authToken: token,
       typegate,
       typegraphUrl: new URL(
         `internal+hostcall+deno://typegate/${typegraphName}`,

src/typegate/src/runtimes/python.ts

@@ -122,10 +122,8 @@ export class PythonRuntime extends Runtime {
 
     // add default vm for lambda/def
     const uuid = crypto.randomUUID();
-    const token = await InternalAuth.emit(typegate.cryptoKeys);
 
     const hostcallCtx = {
-      authToken: token,
       typegate,
       typegraphUrl: new URL(
         `internal+hostcall+witwire://typegate/${typegraphName}`,

src/typegate/src/runtimes/substantial.ts

@@ -118,10 +118,7 @@ export class SubstantialRuntime extends Runtime {
       maxAcquirePerTick: typegate.config.base.substantial_max_acquire_per_tick!,
     } satisfies AgentConfig;
 
-    const token = await InternalAuth.emit(typegate.cryptoKeys);
-
     const hostcallCtx = {
-      authToken: token,
       typegate,
       typegraphUrl: new URL(
         `internal+hostcall+subs://typegate/${params.typegraphName}`,

src/typegate/src/runtimes/wasm_wire.ts

@@ -53,9 +53,9 @@ export class WasmRuntimeWire extends Runtime {
     };
 
     const uuid = crypto.randomUUID();
-    const token = await InternalAuth.emit(typegate.cryptoKeys);
-    const componentPath =
-      await typegate.artifactStore.getLocalPath(artifactMeta);
+    const componentPath = await typegate.artifactStore.getLocalPath(
+      artifactMeta,
+    );
 
     const wireMat = materializers.map((mat) => ({
       op_name: mat.data.op_name as string,
@@ -66,9 +66,10 @@ export class WasmRuntimeWire extends Runtime {
     }));
 
     const hostcallCtx = {
-      authToken: token,
       typegate,
-      typegraphUrl: new URL(`internal+hostcall+witwire://typegate/${typegraphName}`),
+      typegraphUrl: new URL(
+        `internal+hostcall+witwire://typegate/${typegraphName}`,
+      ),
     };
 
     const workerManager = new WorkerManager(hostcallCtx);

src/typegate/src/runtimes/wit_wire/hostcall.ts

@@ -4,12 +4,12 @@
 import * as zod from "zod";
 import type { Typegate } from "../../typegate/mod.ts";
 import { getLogger } from "../../log.ts";
+import { InternalAuth } from "../../services/auth/protocols/internal.ts";
 
 const logger = getLogger(import.meta);
 
 export type HostCallCtx = {
   typegate: Typegate;
-  authToken: string;
   typegraphUrl: URL;
 };
 
@@ -64,7 +64,7 @@ async function gql(cx: HostCallCtx, args: object) {
     throw new Error("error validating gql args", {
       cause: {
         zodErr: parseRes.error,
-        args
+        args,
       },
     });
   }
@@ -82,12 +82,13 @@ async function gql(cx: HostCallCtx, args: object) {
     }
   }
 
+  const token = await InternalAuth.emit(cx.typegate.cryptoKeys);
   const request = new Request(cx.typegraphUrl, {
     method: "POST",
     headers: {
       accept: "application/json",
       "content-type": "application/json",
-      authorization: `Bearer ${cx.authToken}`,
+      authorization: `Bearer ${token}`,
     },
     body: JSON.stringify({
       query: parsed.query,

tools/Dockerfile

@@ -62,7 +62,7 @@ ENV GHJK_ENV=oci
 ENV GHJK_ACTIVATE=.ghjk/envs/$GHJK_ENV/activate.sh
 RUN ghjk envs cook
 
-SHELL ["/bin/sh", "-c", ". .ghjk/envs/oci/activate.sh && sh -c \"$*\"", "sh"]
+SHELL ["/bin/sh", "-c", ". ${GHJK_ACTIVATE} && sh -c \"$*\"", "sh"]
 
 COPY --from=plan /app/recipe.json recipe.json
 

tools/list-duplicates.ts

@@ -337,46 +337,52 @@ export function listDuplicates(tg: TypeGraphDS, rootIdx = 0) {
   }
 }
 
-const args = parseArgs(Deno.args, {
-  string: ["root"],
-});
+// const args = parseArgs(Deno.args, {
+//   string: ["root"],
+// });
+//
+// const rootIdx = argToInt(args.root, 0);
+//
+// const files = args._ as string[];
+// if (files.length === 0) {
+//   throw new Error("Path to typegraph definition module is required.");
+// }
+// if (files.length > 1) {
+//   throw new Error("Cannot accept more than one file");
+// }
+// const cmd = [
+//   "cargo",
+//   "run",
+//   "--manifest-path",
+//   `${projectDir}/Cargo.toml`,
+//   "-p",
+//   "meta-cli",
+//   "--",
+//   "serialize",
+//   "-f",
+//   files[0],
+// ];
+// const { stdout } = await new Deno.Command(cmd[0], {
+//   args: cmd.slice(1),
+//   stdout: "piped",
+//   stderr: "inherit",
+// }).output();
+//
+// function argToInt(arg: string | undefined, defaultValue: number): number {
+//   const parsed = parseInt(arg ?? `${defaultValue}`);
+//   return isNaN(parsed) ? defaultValue : parsed;
+// }
 
-const rootIdx = argToInt(args.root, 0);
-
-const files = args._ as string[];
-if (files.length === 0) {
-  throw new Error("Path to typegraph definition module is required.");
-}
-if (files.length > 1) {
-  throw new Error("Cannot accept more than one file");
+let raw = "";
+const decoder = new TextDecoder();
+for await (const chunk of Deno.stdin.readable) {
+  raw += decoder.decode(chunk);
+  // do something with the text
 }
-const cmd = [
-  "cargo",
-  "run",
-  "--manifest-path",
-  `${projectDir}/Cargo.toml`,
-  "-p",
-  "meta-cli",
-  "--",
-  "serialize",
-  "-f",
-  files[0],
-];
-const { stdout } = await new Deno.Command(cmd[0], {
-  args: cmd.slice(1),
-  stdout: "piped",
-  stderr: "inherit",
-}).output();
 
-const tgs: TypeGraphDS[] = JSON.parse(
-  new TextDecoder().decode(stdout),
-);
+// const raw = new TextDecoder().decode(stdout),
+const tgs: TypeGraphDS[] = JSON.parse(raw);
 
 for (const tg of tgs) {
-  listDuplicatesEnhanced(tg, rootIdx);
-}
-
-function argToInt(arg: string | undefined, defaultValue: number): number {
-  const parsed = parseInt(arg ?? `${defaultValue}`);
-  return isNaN(parsed) ? defaultValue : parsed;
+  listDuplicatesEnhanced(tg, 0);
 }