Skip to content

refactor: Migrate server to centralized happy-api-client package #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bra1nDump wants to merge 5 commits into
base: main
Choose a base branch
from
Open

refactor: Migrate server to centralized happy-api-client package #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b1cebd
Use @happy/shared-types package directly
bra1nDump Aug 20, 2025
957b400
Merge branch 'main' into shared-types
bra1nDump Aug 23, 2025
6646f39
refactor: Migrate server to use centralized happy-api-client package
bra1nDump Aug 23, 2025
3f35f8d
chore: Use published happy-api-client from npm
bra1nDump Aug 23, 2025
10317b2
feat: Add connectivity status tracking for sessions and machines
bra1nDump Aug 27, 2025
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"yaml": "^2.4.2"
},
"dependencies": {
"happy-api-client": "^0.1.0",
"@date-fns/tz": "^1.2.0",
"@fastify/bearer-auth": "^10.1.1",
"@fastify/cors": "^10.0.1",
Expand Down
5 changes: 5 additions & 0 deletions prisma/migrations/20250124000000_add_connectivity_lifecycle/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- AlterEnum
-- Update enum values from SCREAMING_CASE to kebab-case
ALTER TYPE "ConnectivityStatus" RENAME VALUE 'NEVER_CONNECTED' TO 'never_connected';
ALTER TYPE "ConnectivityStatus" RENAME VALUE 'ONLINE' TO 'online';
ALTER TYPE "ConnectivityStatus" RENAME VALUE 'OFFLINE' TO 'offline';
12 changes: 12 additions & 0 deletions prisma/migrations/20250823130823_add_connectivity_status/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-- CreateEnum
CREATE TYPE "public"."ConnectivityStatus" AS ENUM ('NEVER_CONNECTED', 'ONLINE', 'OFFLINE');

-- AlterTable
ALTER TABLE "public"."Machine" ADD COLUMN "connectivityStatus" "public"."ConnectivityStatus" NOT NULL DEFAULT 'NEVER_CONNECTED',
ADD COLUMN "connectivityStatusReason" TEXT NOT NULL DEFAULT '',
ADD COLUMN "connectivityStatusSince" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

-- AlterTable
ALTER TABLE "public"."Session" ADD COLUMN "connectivityStatus" "public"."ConnectivityStatus" NOT NULL DEFAULT 'NEVER_CONNECTED',
ADD COLUMN "connectivityStatusReason" TEXT NOT NULL DEFAULT '',
ADD COLUMN "connectivityStatusSince" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
75 changes: 48 additions & 27 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ datasource db {
url = env("DATABASE_URL")
}

//
// Enums
//

enum ConnectivityStatus {
never_connected
online
offline
}
//
// Account
//
Expand Down Expand Up @@ -71,21 +80,27 @@ model AccountPushToken {
//

model Session {
id String @id @default(cuid())
tag String
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String
metadataVersion Int @default(0)
agentState String?
agentStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
messages SessionMessage[]
usageReports UsageReport[]
id String @id @default(cuid())
tag String
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String
metadataVersion Int @default(0)
agentState String?
agentStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())

// Connectivity tracking
connectivityStatus ConnectivityStatus @default(never_connected)
connectivityStatusSince DateTime @default(now())
connectivityStatusReason String @default("")

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
messages SessionMessage[]
usageReports UsageReport[]

@@unique([accountId, tag])
@@index([accountId, updatedAt(sort: Desc)])
Expand Down Expand Up @@ -158,18 +173,24 @@ model UsageReport {
//

model Machine {
id String @id
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String // Encrypted - contains static machine info
metadataVersion Int @default(0)
daemonState String? // Encrypted - contains dynamic daemon state
daemonStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
id String @id
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String // Encrypted - contains static machine info
metadataVersion Int @default(0)
daemonState String? // Encrypted - contains dynamic daemon state
daemonStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())

// Connectivity tracking
connectivityStatus ConnectivityStatus @default(never_connected)
connectivityStatusSince DateTime @default(now())
connectivityStatusReason String @default("")

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([accountId, id])
@@index([accountId])
Expand Down
203 changes: 203 additions & 0 deletions prisma/schema.prisma.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
// This is your Prisma schema file,
// learn more about it in the docs: https://pris.ly/d/prisma-schema

generator client {
provider = "prisma-client-js"
previewFeatures = ["metrics", "relationJoins"]
}

generator json {
provider = "prisma-json-types-generator"
}

datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
}

//
// Enums
//

enum ConnectivityStatus {
NEVER_CONNECTED
ONLINE
OFFLINE
}

enum SessionLifecycle {
ACTIVE
ARCHIVE_REQUESTED
ARCHIVED
}
//
// Account
//

model Account {
id String @id @default(cuid())
publicKey String @unique
seq Int @default(0)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
settings String?
settingsVersion Int @default(0)
Session Session[]
AccountPushToken AccountPushToken[]
TerminalAuthRequest TerminalAuthRequest[]
AccountAuthRequest AccountAuthRequest[]
UsageReport UsageReport[]
Machine Machine[]
}

model TerminalAuthRequest {
id String @id @default(cuid())
publicKey String @unique
response String?
responseAccountId String?
responseAccount Account? @relation(fields: [responseAccountId], references: [id])
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}

model AccountAuthRequest {
id String @id @default(cuid())
publicKey String @unique
response String?
responseAccountId String?
responseAccount Account? @relation(fields: [responseAccountId], references: [id])
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}

model AccountPushToken {
id String @id @default(cuid())
accountId String
account Account @relation(fields: [accountId], references: [id])
token String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([accountId, token])
}

//
// Sessions
//

model Session {
id String @id @default(cuid())
tag String
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String
metadataVersion Int @default(0)
agentState String?
agentStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())

// Connectivity tracking
connectivityStatus ConnectivityStatus @default(NEVER_CONNECTED)
connectivityStatusSince DateTime @default(now())
connectivityStatusReason String @default("")

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
messages SessionMessage[]
usageReports UsageReport[]

@@unique([accountId, tag])
@@index([accountId, updatedAt(sort: Desc)])
}

model SessionMessage {
id String @id @default(cuid())
sessionId String
session Session @relation(fields: [sessionId], references: [id])
localId String?
seq Int
/// [SessionMessageContent]
content Json
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([sessionId, localId])
@@index([sessionId, seq])
}

//
// Utility
//

model GlobalLock {
key String @id @default(cuid())
value String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
expiresAt DateTime
}

model RepeatKey {
key String @id
value String
createdAt DateTime @default(now())
expiresAt DateTime
}

model SimpleCache {
key String @id
value String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}

//
// Usage Reporting
//

model UsageReport {
id String @id @default(cuid())
key String
accountId String
account Account @relation(fields: [accountId], references: [id])
sessionId String?
session Session? @relation(fields: [sessionId], references: [id])
/// [UsageReportData]
data Json
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([accountId, sessionId, key])
@@index([accountId])
@@index([sessionId])
}

//
// Machines
//

model Machine {
id String @id
accountId String
account Account @relation(fields: [accountId], references: [id])
metadata String // Encrypted - contains static machine info
metadataVersion Int @default(0)
daemonState String? // Encrypted - contains dynamic daemon state
daemonStateVersion Int @default(0)
seq Int @default(0)
active Boolean @default(true)
lastActiveAt DateTime @default(now())

// Connectivity tracking
connectivityStatus ConnectivityStatus @default(NEVER_CONNECTED)
connectivityStatusSince DateTime @default(now())
connectivityStatusReason String @default("")

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([accountId, id])
@@index([accountId])
}
Loading