@goscribe/server 1.0.11 → 1.1.0

package/dist/trpc.js

@@ -1,25 +1,74 @@
 import { initTRPC, TRPCError } from "@trpc/server";
 import superjson from "superjson";
+import { logger } from "./lib/logger.js";
+import { toTRPCError } from "./lib/errors.js";
 const t = initTRPC.context().create({
     transformer: superjson,
-    errorFormatter({ shape }) {
-        return shape;
+    errorFormatter({ shape, error }) {
+        // Log errors in development
+        if (process.env.NODE_ENV === 'development') {
+            logger.error('TRPC Error', 'TRPC', {
+                code: error.code,
+                message: error.message,
+                cause: error.cause,
+            });
+        }
+        return {
+            ...shape,
+            data: {
+                ...shape.data,
+                zodError: error.cause instanceof Error ? error.cause.message : null,
+            },
+        };
     },
 });
 export const router = t.router;
 export const middleware = t.middleware;
 export const publicProcedure = t.procedure;
-/** Middleware that enforces authentication */
+/**
+ * Logging middleware
+ */
+const loggingMiddleware = middleware(async ({ ctx, next, path, type }) => {
+    const start = Date.now();
+    const result = await next();
+    const duration = Date.now() - start;
+    logger.info(`TRPC ${type} ${path}`, 'TRPC', {
+        duration: `${duration}ms`,
+        userId: ctx.session?.user?.id,
+    });
+    return result;
+});
+/**
+ * Middleware that enforces authentication
+ */
 const isAuthed = middleware(({ ctx, next }) => {
     const hasUser = Boolean(ctx.session?.user?.id);
     if (!ctx.session || !hasUser) {
-        throw new TRPCError({ code: "UNAUTHORIZED" });
+        throw new TRPCError({
+            code: "UNAUTHORIZED",
+            message: "You must be logged in to access this resource"
+        });
     }
     return next({
         ctx: {
             session: ctx.session,
+            userId: ctx.session.user.id,
         },
     });
 });
-/** Exported authed procedure */
-export const authedProcedure = publicProcedure.use(isAuthed);
+/**
+ * Error handling middleware
+ */
+const errorHandler = middleware(async ({ next }) => {
+    try {
+        return await next();
+    }
+    catch (error) {
+        throw toTRPCError(error);
+    }
+});
+/** Exported procedures with middleware */
+export const authedProcedure = publicProcedure
+    .use(loggingMiddleware)
+    .use(errorHandler)
+    .use(isAuthed);

package/dist/types/index.d.ts

@@ -0,0 +1,126 @@
+import type { Prisma } from '@prisma/client';
+/**
+ * Common types for the application
+ */
+export type PrismaTransaction = Omit<Prisma.TransactionClient, '$connect' | '$disconnect' | '$on' | '$transaction' | '$use'>;
+/**
+ * User types
+ */
+export interface UserSession {
+    id: string;
+    name?: string | null;
+    email?: string | null;
+    image?: string | null;
+}
+export interface AuthContext {
+    session: {
+        user: UserSession;
+    } | null;
+    userId?: string;
+}
+/**
+ * Artifact types
+ */
+export type ArtifactTypeEnum = 'STUDY_GUIDE' | 'FLASHCARD_SET' | 'WORKSHEET' | 'MEETING_SUMMARY' | 'PODCAST_EPISODE';
+export type DifficultyEnum = 'EASY' | 'MEDIUM' | 'HARD';
+export type QuestionTypeEnum = 'MULTIPLE_CHOICE' | 'TEXT' | 'NUMERIC' | 'TRUE_FALSE' | 'MATCHING' | 'FILL_IN_THE_BLANK';
+/**
+ * Worksheet types
+ */
+export interface MarkSchemePoint {
+    point: number;
+    requirements: number;
+}
+export interface MarkScheme {
+    points: MarkSchemePoint[];
+    totalPoints: number;
+}
+export interface UserMarkSchemePoint extends MarkSchemePoint {
+    achievedPoints: number;
+    feedback: string;
+}
+export interface UserMarkScheme {
+    points: UserMarkSchemePoint[];
+    totalPoints: number;
+}
+export interface WorksheetQuestionMeta {
+    options?: string[];
+    completed?: boolean;
+    userAnswer?: string;
+    completedAt?: Date | null;
+    mark_scheme?: MarkScheme;
+    userMarkScheme?: UserMarkScheme;
+}
+export interface WorksheetQuestionProgressMeta {
+    userMarkScheme?: UserMarkScheme;
+}
+export interface CreateWorksheetQuestionInput {
+    prompt: string;
+    answer?: string;
+    type: QuestionTypeEnum;
+    difficulty?: DifficultyEnum;
+    order?: number;
+    meta?: WorksheetQuestionMeta;
+}
+export interface UpdateWorksheetQuestionInput extends Partial<CreateWorksheetQuestionInput> {
+    id: string;
+}
+/**
+ * Flashcard types
+ */
+export interface CreateFlashcardInput {
+    front: string;
+    back: string;
+    tags?: string[];
+    order?: number;
+}
+export interface UpdateFlashcardInput extends Partial<CreateFlashcardInput> {
+    id: string;
+}
+/**
+ * File upload types
+ */
+export interface FileUploadResult {
+    id: string;
+    name: string;
+    url: string;
+    mimeType: string;
+    size: number;
+}
+/**
+ * Pagination types
+ */
+export interface PaginationInput {
+    page?: number;
+    limit?: number;
+}
+export interface PaginatedResult<T> {
+    data: T[];
+    pagination: {
+        page: number;
+        limit: number;
+        total: number;
+        totalPages: number;
+    };
+}
+/**
+ * Search types
+ */
+export interface SearchInput extends PaginationInput {
+    query: string;
+}
+/**
+ * Response types
+ */
+export type SuccessResponse<T = void> = {
+    success: true;
+    data: T;
+    message?: string;
+};
+export type ErrorResponse = {
+    success: false;
+    error: {
+        code: string;
+        message: string;
+    };
+};

package/dist/types/index.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goscribe/server",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,9 +22,9 @@
   "dependencies": {
     "@auth/express": "^0.11.0",
     "@auth/prisma-adapter": "^2.10.0",
-    "@google-cloud/storage": "^7.17.0",
     "@goscribe/server": "^1.0.8",
     "@prisma/client": "^6.14.0",
+    "@supabase/supabase-js": "^2.76.1",
     "@trpc/server": "^11.5.0",
     "@types/uuid": "^10.0.0",
     "@vingeray/editorjs-markdown-converter": "^0.1.2",
@@ -36,6 +36,7 @@
     "express": "^5.1.0",
     "helmet": "^8.1.0",
     "morgan": "^1.10.1",
+    "openai": "^6.3.0",
     "prisma": "^6.14.0",
     "pusher": "^5.2.0",
     "pusher-js": "^8.4.0",

package/prisma/schema.prisma

@@ -50,11 +50,18 @@ model User {
   // Ownership
   folders       Folder[]          @relation("UserFolders")
   workspaces    Workspace[]       @relation("UserWorkspaces")
-  invitedInWorkspaces Workspace[]       @relation("WorkspaceSharedWith") // many-to-many
+  invitedInWorkspaces Workspace[]       @relation("WorkspaceSharedWith") // many-to-many (deprecated)
+  workspaceMemberships WorkspaceMember[] // proper member management
   uploads       FileAsset[]       @relation("UserUploads")
   artifacts     Artifact[]        @relation("UserArtifacts")
   versions      ArtifactVersion[] @relation("UserArtifactVersions")
+  
+  // Progress tracking
+  flashcardProgress         FlashcardProgress[]       @relation("UserFlashcardProgress")
   worksheetQuestionProgress WorksheetQuestionProgress[]
+  
+  // Invitations
+  sentInvitations WorkspaceInvitation[] @relation("UserInvitations")
 
   chats         Chat[]
   createdAt     DateTime  @default(now())
@@ -109,6 +116,7 @@ model Workspace {
   ownerId     String
   owner       User     @relation("UserWorkspaces", fields: [ownerId], references: [id], onDelete: Cascade)
   icon        String   @default("📄")
+  color       String   @default("#9D00FF")
 
   // A workspace (file) lives in a folder (nullable = root)
   folderId    String?
@@ -116,15 +124,20 @@ model Workspace {
   
   channels  Channel[]
 
-  shareLink   String?  @unique // optional public share link
+  sharedWith  User[]   @relation("WorkspaceSharedWith") // many-to-many for sharing (deprecated)
+  members     WorkspaceMember[] // proper member management with roles
+  fileBeingAnalyzed Boolean @default(false)
 
-  sharedWith  User[]   @relation("WorkspaceSharedWith") // many-to-many for sharing
+  analysisProgress Json?
 
   // Raw uploads attached to this workspace
   uploads     FileAsset[]
 
   // AI outputs for this workspace (study guides, flashcards, etc.)
   artifacts   Artifact[]
+  
+  // Invitations
+  invitations WorkspaceInvitation[]
 
   createdAt   DateTime @default(now())
   updatedAt   DateTime @updatedAt
@@ -201,10 +214,14 @@ model Artifact {
   title       String
   isArchived  Boolean      @default(false)
 
+  generating Boolean      @default(false)
+  generatingMetadata Json?    
+
   // Worksheet-specific fields
   difficulty  Difficulty?  // only meaningful for WORKSHEET
   estimatedTime String?    // only meaningful for WORKSHEET
 
+  imageObjectKey String?
   description     String?
 
   createdById String?
@@ -213,6 +230,7 @@ model Artifact {
   versions    ArtifactVersion[] // text/transcript versions etc.
   flashcards  Flashcard[]       // only meaningful for FLASHCARD_SET
   questions   WorksheetQuestion[] // only meaningful for WORKSHEET
+  podcastSegments PodcastSegment[] // only meaningful for PODCAST_EPISODE
 
   createdAt   DateTime     @default(now())
   updatedAt   DateTime     @updatedAt
@@ -256,11 +274,51 @@ model Flashcard {
   tags       String[] // optional keywords
   order      Int      @default(0)
 
+  // User progress tracking
+  progress   FlashcardProgress[]
+
   createdAt  DateTime @default(now())
 
   @@index([artifactId])
 }
 
+//
+// User Progress on Flashcards (spaced repetition, mastery tracking)
+//
+model FlashcardProgress {
+  id          String   @id @default(cuid())
+  userId      String
+  user        User     @relation("UserFlashcardProgress", fields: [userId], references: [id], onDelete: Cascade)
+  
+  flashcardId String
+  flashcard   Flashcard @relation(fields: [flashcardId], references: [id], onDelete: Cascade)
+
+  // Study statistics
+  timesStudied              Int      @default(0)
+  timesCorrect              Int      @default(0)
+  timesIncorrect            Int      @default(0)
+  timesIncorrectConsecutive Int      @default(0)  // Track consecutive failures
+  
+  // Spaced repetition data
+  easeFactor      Float    @default(2.5)  // SM-2 algorithm ease factor
+  interval        Int      @default(0)     // Days until next review
+  repetitions     Int      @default(0)     // Consecutive correct answers
+  
+  // Mastery level (0-100)
+  masteryLevel    Int      @default(0)
+  
+  // Timestamps
+  lastStudiedAt   DateTime?
+  nextReviewAt    DateTime?
+  
+  createdAt       DateTime @default(now())
+  updatedAt       DateTime @updatedAt
+
+  @@unique([userId, flashcardId])
+  @@index([userId, nextReviewAt])
+  @@index([flashcardId])
+}
+
 //
 // Worksheet Questions (child items of a WORKSHEET Artifact)
 //
@@ -294,8 +352,9 @@ model WorksheetQuestionProgress {
   userId               String
   user                 User              @relation(fields: [userId], references: [id], onDelete: Cascade)
 
-  completed            Boolean           @default(false)
+  modified            Boolean           @default(false)
   userAnswer           String?
+  correct              Boolean?           @default(false)
   completedAt          DateTime?
   attempts             Int               @default(0)
   timeSpentSec         Int?
@@ -306,4 +365,83 @@ model WorksheetQuestionProgress {
 
   @@unique([worksheetQuestionId, userId])
   @@index([userId])
+}
+
+//
+// Workspace Members (with roles)
+//
+model WorkspaceMember {
+  id          String    @id @default(cuid())
+  workspaceId String
+  workspace   Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  
+  userId      String
+  user        User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  
+  role        String    @default("member") // "owner", "admin", "member"
+  
+  joinedAt    DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  
+  @@unique([workspaceId, userId]) // One membership per user per workspace
+  @@index([workspaceId])
+  @@index([userId])
+}
+
+//
+// Workspace Invitations
+//
+model WorkspaceInvitation {
+  id          String    @id @default(cuid())
+  workspaceId String
+  workspace   Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  
+  email       String
+  role        String    @default("member") // "owner", "admin", "member"
+  token       String    @unique @default(cuid()) // UUID for invitation link
+  
+  invitedById String
+  invitedBy   User      @relation("UserInvitations", fields: [invitedById], references: [id], onDelete: Cascade)
+  
+  acceptedAt  DateTime?
+  expiresAt   DateTime  @default(dbgenerated("NOW() + INTERVAL '7 days'"))
+  
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  
+  @@unique([workspaceId, email]) // One invitation per email per workspace
+  @@index([token])
+  @@index([workspaceId])
+}
+
+//
+// Podcast Segments (child items of a PODCAST_EPISODE Artifact)
+//
+model PodcastSegment {
+  id         String   @id @default(cuid())
+  artifactId String
+  artifact   Artifact @relation(fields: [artifactId], references: [id], onDelete: Cascade)
+
+  title      String
+  content    String   // Full text content of the segment
+  startTime  Int      // Start time in seconds
+  duration   Int      // Duration in seconds
+  order      Int      // Display order within the episode
+  
+  // Audio file reference
+  objectKey  String?  // Google Cloud Storage object key
+  audioUrl   String?  // Cached signed URL (temporary)
+  
+  // Metadata
+  keyPoints  String[] // Array of key points
+  meta       Json?    // Additional metadata (voice settings, etc.)
+  
+  generating Boolean @default(false)
+  generatingMetadata Json? // Additional metadata (voice settings, etc.)
+  
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+
+  @@index([artifactId, order]) // For efficient ordering
+  @@index([artifactId, startTime]) // For time-based queries
 }