Skip to content
This repository has been archived by the owner on Jan 2, 2025. It is now read-only.

Fix "over dragging" issue, add debug logging, fix LEVEL_NOT_FOUND error messages #99

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-server-api/routes/api/dev_package_examples/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default withWinterSpec({
})

const dev_package_example = await ctx.db.put("dev_package_example", {
dev_package_example_id: existingDevPackageExample?.dev_package_example_id,
...existingDevPackageExample,
file_path: req.jsonBody.file_path,
export_name: req.jsonBody.export_name,
error: req.jsonBody.error,
Expand Down
2 changes: 1 addition & 1 deletion dev-server-api/routes/api/dev_package_examples/get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default withWinterSpec({
)

if (!dev_package_example) {
throw new NotFoundError("Package not found")
return new Response("Package not found", { status: 404 })
}

return ctx.json({
Expand Down
2 changes: 1 addition & 1 deletion dev-server-api/routes/api/dev_package_examples/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default withWinterSpec({
)

if (!dev_package_example) {
throw new NotFoundError("Package not found")
return new Response("Package not found", { status: 404 })
}

const new_dev_package_example = {
Expand Down
3 changes: 2 additions & 1 deletion dev-server-api/src/db/zod-level-db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export class ZodLevelDatabase {
id: string | number
): Promise<DBSchemaType[K] | null> {
const key = `${collection}:${id}`
const data = await this.db.get(key)
const data = await this.db.get(key).catch((e) => null)
if (!data) return null
return DBSchema.shape[collection].parse(JSON.parse(data)) as any
}

Expand Down
13 changes: 13 additions & 0 deletions dev-server-api/src/middlewares/with-debug-request-logging.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import type { Middleware } from "winterspec"
import Debug from "debug"

const debug = Debug("tscircuit:cli:api")

export const withDebugRequestLogging: Middleware<{}, {}> = async (
req,
ctx,
next
) => {
debug(`[REQ] ${req.method?.toUpperCase()} ${req.url}`)
return next(req, ctx)
}
3 changes: 2 additions & 1 deletion dev-server-api/src/with-winter-spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { createWithWinterSpec } from "winterspec"
import { withDb } from "./middlewares/with-db"
import { withErrorResponse } from "./middlewares/with-error-response"
import { withDebugRequestLogging } from "./middlewares/with-debug-request-logging"

export const withWinterSpec = createWithWinterSpec({
authMiddleware: {},
beforeAuthMiddleware: [withErrorResponse, withDb],
beforeAuthMiddleware: [withDebugRequestLogging, withErrorResponse, withDb],
})
10 changes: 10 additions & 0 deletions dev-server-api/tests/routes/dev_package_examples/update.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,14 @@ it("POST /api/dev_package_examples/update", async () => {
expect(res.dev_package_example.edit_events_last_applied_at).toEqual(
"2023-01-01T00:00:00.000Z"
)

const getRes = await axios.post("/api/dev_package_examples/get", {
dev_package_example_id: 1,
})

expect(getRes.status).toBe(200)
expect(getRes.data.dev_package_example.completed_edit_events).toEqual([])
expect(getRes.data.dev_package_example.edit_events_last_applied_at).toEqual(
"2023-01-01T00:00:00.000Z"
)
})
18 changes: 18 additions & 0 deletions example-project/src/manual-edits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@ export default {
"y": 0
},
"relative_to": "group_center"
},
{
"_edit_event_id": "0.4555106760070762",
"selector": ".C1",
"center": {
"x": 0,
"y": 2.6666666666666665
},
"relative_to": "group_center"
},
{
"_edit_event_id": "0.6123290063979561",
"selector": ".R2",
"center": {
"x": 13.457749922536511,
"y": 5.576084911465589
},
"relative_to": "group_center"
}
],
manual_trace_hints: [],
Expand Down
2 changes: 1 addition & 1 deletion lib/cmd-fns/dev/start-export-request-watcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const startExportRequestWatcher = async (
kleur.red(`Error in export request watcher: ${err.toString()}`)
)
}
await new Promise((resolve) => setTimeout(resolve, 100))
await new Promise((resolve) => setTimeout(resolve, 1000))
}
})()

Expand Down
Loading