Add tests

Author: courtney-sims

apps/sandbox-container/container/fileUtils.spec.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { get_file_name_from_path } from "./fileUtils";
+
+describe ("get_file_name_from_path", () => {
+    it("strips files/contents", async () => {
+        const path = await get_file_name_from_path('/files/contents/cats');
+        expect(path).toBe("/cats");
+    }),
+    it("works if files/contents is not present", async () => {
+        const path = await get_file_name_from_path('/dogs');
+        expect(path).toBe("/dogs");
+    }),
+    it("strips a trailing slash", async () => {
+        const path = await get_file_name_from_path('/files/contents/birds/');
+        expect(path).toBe("/birds");
+    })
+})

apps/sandbox-container/container/fileUtils.ts

@@ -0,0 +1,6 @@
+export async function get_file_name_from_path(path: string): Promise<string> {
+    path = path.replace('/files/contents', '')
+	path = path.endsWith('/') ? path.substring(0, path.length - 1) : path
+
+    return path
+}

apps/sandbox-container/container/index.ts

@@ -7,7 +7,9 @@ import { exec } from 'node:child_process'
 import * as fs from 'node:fs/promises'
 import path from 'node:path'
 
-import { ExecParams, FileList, FilesWrite } from '../shared/schema.ts'
+import type { FileList } from '../shared/schema.ts'
+import { ExecParams, FilesWrite } from '../shared/schema.ts'
+import { get_file_name_from_path } from './fileUtils.ts'
 
 process.chdir('workdir')
 
@@ -60,8 +62,7 @@ app.get('/files/ls', async (c) => {
  * Get the contents of a file or directory
  */
 app.get('/files/contents/*', async (c) => {
-	let reqPath = c.req.path.replace('/files/contents', '')
-	reqPath = reqPath.endsWith('/') ? reqPath.substring(0, reqPath.length - 1) : reqPath
+	const reqPath = await get_file_name_from_path(c.req.path)
 	try {
 		const mimeType = mime.getType(reqPath)
 		const headers = mimeType ? { 'Content-Type': mimeType } : undefined
@@ -105,7 +106,8 @@ app.get('/files/contents/*', async (c) => {
  */
 app.post('/files/contents', zValidator('json', FilesWrite), async (c) => {
 	const file = c.req.valid('json')
-	const reqPath = file.path.endsWith('/') ? file.path.substring(0, file.path.length - 1) : file.path
+	const reqPath = await get_file_name_from_path(file.path)
+
 	try {
 		await fs.writeFile(reqPath, file.text)
 		return c.newResponse(null, 200)
@@ -120,8 +122,8 @@ app.post('/files/contents', zValidator('json', FilesWrite), async (c) => {
  * Delete a file or directory
  */
 app.delete('/files/contents/*', async (c) => {
-	let reqPath = c.req.path.replace('/files/contents', '')
-	reqPath = reqPath.endsWith('/') ? reqPath.substring(0, reqPath.length - 1) : reqPath
+	const reqPath = await get_file_name_from_path(c.req.path)
+
 	try {
 		await fs.rm(path.join(process.cwd(), reqPath), {recursive: true})
 		return c.newResponse('ok', 200)

apps/sandbox-container/package.json

@@ -11,6 +11,7 @@
 		"start": "wrangler dev",
 		"start:container": "tsx container/index.ts",
 		"postinstall": "mkdir -p workdir",
+		"test": "vitest",
 		"types": "wrangler types"
 	},
 	"dependencies": {

apps/sandbox-container/server/containerMcp.ts

@@ -2,9 +2,10 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
 import { z } from 'zod'
 
-import { Env, Props } from '.'
+import type { Env, Props } from '.'
 import { OPEN_CONTAINER_PORT } from '../shared/consts'
-import { ExecParams, FileList, FilePathParam, FilesWrite } from '../shared/schema'
+import type { FileList } from '../shared/schema'
+import { ExecParams, FilePathParam, FilesWrite } from '../shared/schema'
 import { MAX_CONTAINERS, proxyFetch, startAndWaitForPort } from './containerHelpers'
 import { getContainerManager } from './containerManager'
 import { BASE_INSTRUCTIONS } from './prompts'