misc cleanup

capn/syncConfig.ts

@@ -13,7 +13,7 @@ import { startNetwork } from "./startNetwork.ts"
 export async function syncConfig(tempDir: string, config: CapiConfig) {
   return withSignal(async (signal) => {
     const { server } = config
-    let entries = new Map<string, CodegenEntry>()
+    const entries = new Map<string, CodegenEntry>()
     await Promise.all(
       Object.entries(config.chains ?? {}).map(async ([name, chain]) => {
         if (chain.url != null) {
@@ -54,10 +54,10 @@ export async function syncConfig(tempDir: string, config: CapiConfig) {
         )
       }),
     )
-    entries = new Map([...entries].sort((a, b) => a[0] < b[0] ? 1 : -1))
+    const sortedEntries = new Map([...entries].sort((a, b) => a[0] < b[0] ? 1 : -1))
     const codegenHash = await uploadCodegenSpec(server, {
       type: "v0",
-      codegen: entries,
+      codegen: sortedEntries,
     })
     return new URL(codegenHash + "/", server).toString()
   })

cli/resolveConfig.ts

@@ -3,13 +3,13 @@ import * as flags from "../deps/std/flags.ts"
 import * as path from "../deps/std/path.ts"
 
 export async function resolveConfig(...args: string[]) {
-  const { config: configFile } = flags.parse(args, {
+  const { config: rawConfigPath } = flags.parse(args, {
     string: ["config"],
     default: {
       config: "./capi.config.ts",
     },
   })
-  const configPath = path.resolve(configFile)
+  const configPath = path.resolve(rawConfigPath)
   await Deno.stat(configPath)
   const configModule = await import(path.toFileUrl(configPath).toString())
   const config = configModule.config

cli/serve.ts

@@ -2,6 +2,7 @@ import { createTempDir } from "../capn/createTempDir.ts"
 import { createCapnHandler } from "../capn/mod.ts"
 import * as flags from "../deps/std/flags.ts"
 import { serve } from "../deps/std/http.ts"
+import { createCorsHandler } from "../server/corsHandler.ts"
 import { createErrorHandler } from "../server/errorHandler.ts"
 import { createCodegenHandler } from "../server/mod.ts"
 import { InMemoryCache } from "../util/cache/memory.ts"
@@ -38,12 +39,16 @@ export default async function(...args: string[]) {
   if (!running) {
     const capnHandler = createCapnHandler(tempDir, config, signal)
     const codegenHandler = createCodegenHandler(dataCache, tempCache)
-    const handler = createErrorHandler((request) => {
-      if (new URL(request.url).pathname.startsWith("/capn/")) {
-        return capnHandler(request)
+    const handler = createCorsHandler(createErrorHandler(async (request) => {
+      const { pathname } = new URL(request.url)
+      if (pathname === "/capi_cwd") {
+        return new Response(Deno.cwd())
       }
-      return codegenHandler(request)
-    })
+      if (pathname.startsWith("/capn/")) {
+        return await capnHandler(request)
+      }
+      return await codegenHandler(request)
+    }))
     await serve(handler, {
       hostname: "[::]",
       port: +port,

mod.ts

@@ -1,7 +1,7 @@
 export * as $ from "./deps/scale.ts"
 export { BitSequence } from "./deps/scale.ts"
 
-// moderate --exclude main.ts providers server util
+// moderate --exclude main.ts server util capi.config.ts
 
 export * from "./capi.config.ts"
 export * from "./capn/mod.ts"

rpc/Connection.ts

@@ -4,11 +4,6 @@ import { RpcCallMessage, RpcIngressMessage, RpcSubscriptionHandler } from "./rpc
 
 const connectionMemos = new Map<new(discovery: any) => Connection, Map<unknown, Connection>>()
 
-export interface ConnectionCtorLike<D> {
-  new(discovery: D): Connection
-  connect: (discovery: D, signal: AbortSignal) => Connection
-}
-
 export abstract class Connection {
   nextId = 0
   references = 0