@goscribe/server 1.5.0 → 1.6.0

package/dist/context.d.ts

@@ -1,9 +1,22 @@
 import type { CreateExpressContextOptions } from "@trpc/server/adapters/express";
 import { prisma } from "./lib/prisma.js";
 import cookie from "cookie";
+export type SessionUser = {
+    id: string;
+    emailVerified: boolean;
+    isSystemAdmin: boolean;
+};
 export declare function createContext({ req, res }: CreateExpressContextOptions): Promise<{
     db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
-    session: any;
+    session: null;
+    req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    res: import("express").Response<any, Record<string, any>>;
+    cookies: cookie.Cookies;
+} | {
+    db: import("@prisma/client").PrismaClient<import("@prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs>;
+    session: {
+        user: SessionUser;
+    };
     req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     res: import("express").Response<any, Record<string, any>>;
     cookies: cookie.Cookies;

package/dist/context.js

@@ -3,10 +3,31 @@ import { verifyCustomAuthCookie } from "./lib/auth.js";
 import cookie from "cookie";
 export async function createContext({ req, res }) {
     const cookies = cookie.parse(req.headers.cookie ?? "");
-    // Only use custom auth cookie
     const custom = verifyCustomAuthCookie(cookies["auth_token"]);
     if (custom) {
-        return { db: prisma, session: { user: { id: custom.userId } }, req, res, cookies };
+        const user = await prisma.user.findUnique({
+            where: { id: custom.userId },
+            select: {
+                id: true,
+                emailVerified: true,
+                role: { select: { name: true } },
+            },
+        });
+        if (!user) {
+            return { db: prisma, session: null, req, res, cookies };
+        }
+        const sessionUser = {
+            id: user.id,
+            emailVerified: !!user.emailVerified,
+            isSystemAdmin: user.role?.name === "System Admin",
+        };
+        return {
+            db: prisma,
+            session: { user: sessionUser },
+            req,
+            res,
+            cookies,
+        };
     }
     return { db: prisma, session: null, req, res, cookies };
 }

package/dist/lib/ai/index.d.ts

@@ -1,5 +1,5 @@
 import { aiConfig } from './config.js';
-import { complete, completeText } from './llm-client.js';
+import { complete, completeText, streamComplete } from './llm-client.js';
 import { DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, toVectorLiteral } from './embedding-client.js';
 import { extractJson, parseJsonField } from './json-parse.js';
 import { isAiMockMode, mockDelay } from './mock.js';
@@ -28,6 +28,7 @@ export declare const ai: {
     llm: {
         complete: typeof complete;
         completeText: typeof completeText;
+        streamComplete: typeof streamComplete;
     };
     embed: {
         texts: typeof embedTexts;
@@ -44,4 +45,4 @@ export declare const ai: {
 };
 export type { ChatMessage, ChatRole, CompleteOptions } from './types.js';
 export type { AISession, ProcessFileResult, PodcastSpeaker, StudyGuideSegment, WorksheetGenerationOptions, } from './inference-backend/types.js';
-export { aiConfig, complete, completeText, DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, extractJson, inferenceBackend, isAiMockMode, mockDelay, parseJsonField, toVectorLiteral, };
+export { aiConfig, complete, completeText, streamComplete, DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, extractJson, inferenceBackend, isAiMockMode, mockDelay, parseJsonField, toVectorLiteral, };

package/dist/lib/ai/index.js

@@ -1,5 +1,5 @@
 import { aiConfig } from './config.js';
-import { complete, completeText, } from './llm-client.js';
+import { complete, completeText, streamComplete, } from './llm-client.js';
 import { DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, toVectorLiteral, } from './embedding-client.js';
 import { extractJson, parseJsonField } from './json-parse.js';
 import { isAiMockMode, mockDelay } from './mock.js';
@@ -11,6 +11,7 @@ export const ai = {
     llm: {
         complete,
         completeText,
+        streamComplete,
     },
     embed: {
         texts: embedTexts,
@@ -25,4 +26,4 @@ export const ai = {
         parseJsonField,
     },
 };
-export { aiConfig, complete, completeText, DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, extractJson, inferenceBackend, isAiMockMode, mockDelay, parseJsonField, toVectorLiteral, };
+export { aiConfig, complete, completeText, streamComplete, DEFAULT_EMBEDDING_DIM, DEFAULT_EMBEDDING_MODEL, embedQuery, embedTexts, extractJson, inferenceBackend, isAiMockMode, mockDelay, parseJsonField, toVectorLiteral, };

package/dist/lib/ai/llm-client.d.ts

@@ -2,5 +2,6 @@ import type { ChatCompletion } from 'openai/resources/chat/completions';
 import type { ChatMessage, CompleteOptions } from './types.js';
 export declare function complete(messages: ChatMessage[], options?: CompleteOptions): Promise<ChatCompletion>;
 export declare function completeText(messages: ChatMessage[], options?: CompleteOptions): Promise<string>;
+export declare function streamComplete(messages: ChatMessage[], onDelta: (delta: string) => void | Promise<void>, options?: CompleteOptions): Promise<string>;
 /** @deprecated Use `complete()` from the ai module instead. */
 export default complete;

package/dist/lib/ai/llm-client.js

@@ -15,5 +15,22 @@ export async function completeText(messages, options = {}) {
     const response = await complete(messages, options);
     return response.choices?.[0]?.message?.content ?? '';
 }
+export async function streamComplete(messages, onDelta, options = {}) {
+    const stream = await client.chat.completions.create({
+        model: options.model ?? aiConfig.llm.model,
+        messages,
+        stream: true,
+        ...(options.temperature !== undefined ? { temperature: options.temperature } : {}),
+    });
+    let content = '';
+    for await (const chunk of stream) {
+        const delta = chunk.choices?.[0]?.delta?.content ?? '';
+        if (!delta)
+            continue;
+        content += delta;
+        await onDelta(delta);
+    }
+    return content;
+}
 /** @deprecated Use `complete()` from the ai module instead. */
 export default complete;

package/dist/routers/_app.d.ts

@@ -231,35 +231,26 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 folders: {
                     name: string;
                     id: string;
-                    createdAt: Date;
                     updatedAt: Date;
-                    ownerId: string;
                     parentId: string | null;
                     color: string;
                     markerColor: string | null;
                 }[];
-                workspaces: ({
-                    uploads: {
-                        name: string;
-                        id: string;
-                        createdAt: Date;
-                        mimeType: string;
-                    }[];
-                } & {
+                workspaces: {
                     id: string;
-                    createdAt: Date;
                     updatedAt: Date;
                     title: string;
-                    description: string | null;
-                    ownerId: string;
                     color: string;
                     markerColor: string | null;
                     icon: string;
                     folderId: string | null;
-                    fileBeingAnalyzed: boolean;
-                    analysisProgress: import("@prisma/client/runtime/library").JsonValue | null;
-                    needsAnalysis: boolean;
-                })[];
+                    uploads: {
+                        name: string;
+                        id: string;
+                        createdAt: Date;
+                        mimeType: string;
+                    }[];
+                }[];
             };
             meta: object;
         }>;
@@ -344,74 +335,43 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
                 id: string;
             };
             output: {
+                id: string;
+                createdAt: Date;
+                updatedAt: Date;
+                title: string;
+                description: string | null;
                 folder: {
                     name: string;
                     id: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    ownerId: string;
-                    parentId: string | null;
                     color: string;
-                    markerColor: string | null;
                 } | null;
-                artifacts: {
-                    id: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    workspaceId: string;
-                    type: import("@prisma/client").$Enums.ArtifactType;
-                    title: string;
-                    isArchived: boolean;
-                    difficulty: import("@prisma/client").$Enums.Difficulty | null;
-                    estimatedTime: string | null;
-                    createdById: string | null;
-                    description: string | null;
-                    generating: boolean;
-                    generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
-                    worksheetConfig: import("@prisma/client/runtime/library").JsonValue | null;
-                    imageObjectKey: string | null;
-                }[];
+                ownerId: string;
+                color: string;
+                markerColor: string | null;
+                icon: string;
+                folderId: string | null;
+                fileBeingAnalyzed: boolean;
+                analysisProgress: import("@prisma/client/runtime/library").JsonValue;
+                needsAnalysis: boolean;
                 uploads: {
-                    meta: import("@prisma/client/runtime/library").JsonValue | null;
                     name: string;
                     id: string;
                     createdAt: Date;
-                    workspaceId: string | null;
-                    userId: string | null;
                     mimeType: string;
                     size: number;
-                    bucket: string | null;
                     objectKey: string | null;
-                    url: string | null;
-                    checksum: string | null;
-                    aiTranscription: import("@prisma/client/runtime/library").JsonValue | null;
                 }[];
-            } & {
-                id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                title: string;
-                description: string | null;
-                ownerId: string;
-                color: string;
-                markerColor: string | null;
-                icon: string;
-                folderId: string | null;
-                fileBeingAnalyzed: boolean;
-                analysisProgress: import("@prisma/client/runtime/library").JsonValue | null;
-                needsAnalysis: boolean;
             };
             meta: object;
         }>;
         getStats: import("@trpc/server").TRPCQueryProcedure<{
             input: void;
-            output: {
-                workspaces: number;
-                folders: number;
-                lastUpdated: Date | undefined;
-                spaceUsed: number;
-                spaceTotal: number;
-            };
+            output: import("../services/billing/usage.service.js").AccountStats;
+            meta: object;
+        }>;
+        getAccountSummary: import("@trpc/server").TRPCQueryProcedure<{
+            input: void;
+            output: import("../services/billing/usage.service.js").AccountSummary;
             meta: object;
         }>;
         getStudyAnalytics: import("@trpc/server").TRPCQueryProcedure<{
@@ -866,7 +826,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             input: {
                 workspaceId: string;
             };
-            output: boolean | undefined;
+            output: boolean;
             meta: object;
         }>;
         createCard: import("@trpc/server").TRPCMutationProcedure<{
@@ -949,6 +909,17 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             };
             output: {
                 artifact: {
+                    flashcards: {
+                        id: string;
+                        createdAt: Date;
+                        artifactId: string;
+                        tags: string[];
+                        order: number;
+                        front: string;
+                        back: string;
+                        acceptedAnswers: string[];
+                    }[];
+                } & {
                     id: string;
                     createdAt: Date;
                     updatedAt: Date;
@@ -2665,18 +2636,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
             input: void;
             output: {
                 usage: import("../services/billing/usage.service.js").UserUsage;
-                limits: {
-                    id: string;
-                    planId: string;
-                    maxStorageBytes: bigint;
-                    maxWorksheets: number;
-                    maxFlashcards: number;
-                    maxPodcasts: number;
-                    maxStudyGuides: number;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    isFallbackPlan: boolean;
-                };
+                limits: import("../services/billing/usage.service.js").UserPlanLimits;
                 hasActivePlan: boolean;
             };
             meta: object;

package/dist/routers/auth.js

@@ -26,7 +26,7 @@ const passwordFieldSchema = z
     .regex(/[0-9]/, 'Password must contain at least one number')
     .regex(/[^a-zA-Z0-9]/, 'Password must contain at least one special character');
 export const auth = router({
-    updateProfile: publicProcedure
+    updateProfile: authedProcedure
         .input(z.object({ name: z.string().min(1) }))
         .mutation(({ ctx, input }) => new AuthService(ctx.db).updateProfile(ctx.session.user.id, input)),
     changePassword: authedProcedure

package/dist/routers/flashcards.d.ts

@@ -85,7 +85,7 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
         input: {
             workspaceId: string;
         };
-        output: boolean | undefined;
+        output: boolean;
         meta: object;
     }>;
     createCard: import("@trpc/server").TRPCMutationProcedure<{
@@ -168,6 +168,17 @@ export declare const flashcards: import("@trpc/server").TRPCBuiltRouter<{
         };
         output: {
             artifact: {
+                flashcards: {
+                    id: string;
+                    createdAt: Date;
+                    artifactId: string;
+                    tags: string[];
+                    order: number;
+                    front: string;
+                    back: string;
+                    acceptedAnswers: string[];
+                }[];
+            } & {
                 id: string;
                 createdAt: Date;
                 updatedAt: Date;

package/dist/routers/payment.d.ts

@@ -61,18 +61,7 @@ export declare const paymentRouter: import("@trpc/server").TRPCBuiltRouter<{
         input: void;
         output: {
             usage: import("../services/billing/usage.service.js").UserUsage;
-            limits: {
-                id: string;
-                planId: string;
-                maxStorageBytes: bigint;
-                maxWorksheets: number;
-                maxFlashcards: number;
-                maxPodcasts: number;
-                maxStudyGuides: number;
-                createdAt: Date;
-                updatedAt: Date;
-                isFallbackPlan: boolean;
-            };
+            limits: import("../services/billing/usage.service.js").UserPlanLimits;
             hasActivePlan: boolean;
         };
         meta: object;

package/dist/routers/workspace.d.ts

@@ -53,35 +53,26 @@ export declare const workspace: import("@trpc/server").TRPCBuiltRouter<{
             folders: {
                 name: string;
                 id: string;
-                createdAt: Date;
                 updatedAt: Date;
-                ownerId: string;
                 parentId: string | null;
                 color: string;
                 markerColor: string | null;
             }[];
-            workspaces: ({
-                uploads: {
-                    name: string;
-                    id: string;
-                    createdAt: Date;
-                    mimeType: string;
-                }[];
-            } & {
+            workspaces: {
                 id: string;
-                createdAt: Date;
                 updatedAt: Date;
                 title: string;
-                description: string | null;
-                ownerId: string;
                 color: string;
                 markerColor: string | null;
                 icon: string;
                 folderId: string | null;
-                fileBeingAnalyzed: boolean;
-                analysisProgress: import("@prisma/client/runtime/library").JsonValue | null;
-                needsAnalysis: boolean;
-            })[];
+                uploads: {
+                    name: string;
+                    id: string;
+                    createdAt: Date;
+                    mimeType: string;
+                }[];
+            }[];
         };
         meta: object;
     }>;
@@ -166,74 +157,43 @@ export declare const workspace: import("@trpc/server").TRPCBuiltRouter<{
             id: string;
         };
         output: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            description: string | null;
             folder: {
                 name: string;
                 id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                ownerId: string;
-                parentId: string | null;
                 color: string;
-                markerColor: string | null;
             } | null;
-            artifacts: {
-                id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                workspaceId: string;
-                type: import("@prisma/client").$Enums.ArtifactType;
-                title: string;
-                isArchived: boolean;
-                difficulty: import("@prisma/client").$Enums.Difficulty | null;
-                estimatedTime: string | null;
-                createdById: string | null;
-                description: string | null;
-                generating: boolean;
-                generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
-                worksheetConfig: import("@prisma/client/runtime/library").JsonValue | null;
-                imageObjectKey: string | null;
-            }[];
+            ownerId: string;
+            color: string;
+            markerColor: string | null;
+            icon: string;
+            folderId: string | null;
+            fileBeingAnalyzed: boolean;
+            analysisProgress: import("@prisma/client/runtime/library").JsonValue;
+            needsAnalysis: boolean;
             uploads: {
-                meta: import("@prisma/client/runtime/library").JsonValue | null;
                 name: string;
                 id: string;
                 createdAt: Date;
-                workspaceId: string | null;
-                userId: string | null;
                 mimeType: string;
                 size: number;
-                bucket: string | null;
                 objectKey: string | null;
-                url: string | null;
-                checksum: string | null;
-                aiTranscription: import("@prisma/client/runtime/library").JsonValue | null;
             }[];
-        } & {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            title: string;
-            description: string | null;
-            ownerId: string;
-            color: string;
-            markerColor: string | null;
-            icon: string;
-            folderId: string | null;
-            fileBeingAnalyzed: boolean;
-            analysisProgress: import("@prisma/client/runtime/library").JsonValue | null;
-            needsAnalysis: boolean;
         };
         meta: object;
     }>;
     getStats: import("@trpc/server").TRPCQueryProcedure<{
         input: void;
-        output: {
-            workspaces: number;
-            folders: number;
-            lastUpdated: Date | undefined;
-            spaceUsed: number;
-            spaceTotal: number;
-        };
+        output: import("../services/billing/usage.service.js").AccountStats;
+        meta: object;
+    }>;
+    getAccountSummary: import("@trpc/server").TRPCQueryProcedure<{
+        input: void;
+        output: import("../services/billing/usage.service.js").AccountSummary;
         meta: object;
     }>;
     getStudyAnalytics: import("@trpc/server").TRPCQueryProcedure<{

package/dist/routers/workspace.js

@@ -40,6 +40,7 @@ export const workspace = router({
         .input(z.object({ id: z.string() }))
         .query(({ ctx, input }) => new WorkspaceService(ctx.db).get(ctx.session.user.id, input.id)),
     getStats: authedProcedure.query(({ ctx }) => new WorkspaceService(ctx.db).getStats(ctx.session.user.id)),
+    getAccountSummary: authedProcedure.query(({ ctx }) => new WorkspaceService(ctx.db).getAccountSummary(ctx.session.user.id)),
     getStudyAnalytics: authedProcedure.query(({ ctx }) => new WorkspaceAnalyticsService(ctx.db).getStudyAnalytics(ctx.session.user.id)),
     update: authedProcedure
         .input(z.object({

package/dist/services/billing/payment.service.d.ts

@@ -32,18 +32,7 @@ export declare class PaymentService extends BaseService {
     }>;
     getUsageOverview(userId: string): Promise<{
         usage: import("./usage.service.js").UserUsage;
-        limits: {
-            id: string;
-            planId: string;
-            maxStorageBytes: bigint;
-            maxWorksheets: number;
-            maxFlashcards: number;
-            maxPodcasts: number;
-            maxStudyGuides: number;
-            createdAt: Date;
-            updatedAt: Date;
-            isFallbackPlan: boolean;
-        };
+        limits: import("./usage.service.js").UserPlanLimits;
         hasActivePlan: boolean;
     }>;
     getResourcePrices(): import("@prisma/client").Prisma.PrismaPromise<{

package/dist/services/billing/payment.service.js

@@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server';
 import { BaseService } from '../base.service.js';
 import { stripe } from '../../lib/stripe.js';
 import { env } from '../../lib/env.js';
-import { getUserUsage, getUserPlanLimits } from './usage.service.js';
+import { getAccountSummary } from './usage.service.js';
 import { notifyPaymentSucceeded, notifySubscriptionActivated, notifySubscriptionPaymentSucceeded, } from '../notifications/notification.service.js';
 import { upsertSubscriptionFromStripe } from './subscription.service.js';
 /** Stripe Checkout URLs contain the session id (cs_…); we only store the URL in DB. */
@@ -356,11 +356,8 @@ export class PaymentService extends BaseService {
         }
     }
     async getUsageOverview(userId) {
-        const [usage, limits] = await Promise.all([
-            getUserUsage(userId),
-            getUserPlanLimits(userId),
-        ]);
-        return { usage, limits, hasActivePlan: !!limits };
+        const { usage, limits, hasActivePlan } = await getAccountSummary(userId);
+        return { usage, limits, hasActivePlan };
     }
     getResourcePrices() {
         return this.db.resourcePrice.findMany();

package/dist/services/billing/usage.service.d.ts

@@ -5,15 +5,14 @@ export interface UserUsage {
     podcasts: number;
     storageBytes: number;
 }
-/**
- * Counts all resources consumed by a user across the platform.
- */
-export declare function getUserUsage(userId: string): Promise<UserUsage>;
-/**
- * Retrieves the specific plan limits for a user based on their active subscription
- * PLUS any extra credits purchased.
- */
-export declare function getUserPlanLimits(userId: string): Promise<{
+export interface AccountStats {
+    workspaces: number;
+    folders: number;
+    lastUpdated: Date | null;
+    spaceUsed: number;
+    spaceTotal: number;
+}
+export interface UserPlanLimits {
     id: string;
     planId: string;
     maxStorageBytes: bigint;
@@ -24,4 +23,25 @@ export declare function getUserPlanLimits(userId: string): Promise<{
     createdAt: Date;
     updatedAt: Date;
     isFallbackPlan: boolean;
-}>;
+}
+export interface AccountSummary {
+    stats: AccountStats;
+    usage: UserUsage;
+    limits: UserPlanLimits;
+    hasActivePlan: boolean;
+}
+/** Bust cached usage/limit reads after creates, deletes, or billing changes. */
+export declare function invalidateUserBillingCache(userId: string): void;
+/**
+ * Counts all resources consumed by a user across the platform.
+ */
+export declare function getUserUsage(userId: string): Promise<UserUsage>;
+/**
+ * Retrieves the specific plan limits for a user based on their active subscription
+ * PLUS any extra credits purchased.
+ */
+export declare function getUserPlanLimits(userId: string): Promise<UserPlanLimits>;
+/**
+ * Sidebar/dashboard summary: stats + usage + limits in one parallel DB round-trip batch.
+ */
+export declare function getAccountSummary(userId: string): Promise<AccountSummary>;