create-sprint 0.0.136 → 0.0.139

package/src/templates/configFiles.ts

@@ -1,3 +1,5 @@
+import type { ProjectFeatures } from "../index.js";
+
 export function getTsConfig() {
     return `
 {
@@ -28,59 +30,61 @@ export function getTsConfig() {
     `;
 };
 
-export function getSprintConfigFile(language: string, telemetry: string, swagger: boolean, graphql: boolean) {
+function buildCorsBlock(corsInput: string): string {
+    const trimmed = (corsInput ?? "").trim();
+    if (trimmed === "" || trimmed.toLowerCase() === "deny" || trimmed.toLowerCase() === "none") {
+        return `    cors: false,`;
+    }
+    if (trimmed === "*") {
+        return `    cors: { origin: "*" },`;
+    }
+    const origins = trimmed.split(",").map(o => o.trim()).filter(Boolean);
+    return `    cors: {
+        origin: ${JSON.stringify(origins)},
+        credentials: true,
+        methods: ["GET", "POST", "PUT", "PATCH", "DELETE"],
+        allowedHeaders: ["Content-Type", "Authorization"]
+    },`;
+}
+
+export function getSprintConfigFile(
+    language: string,
+    telemetry: string,
+    swagger: boolean,
+    graphql: boolean,
+    features?: Partial<ProjectFeatures>
+): string {
+    const corsInput = features?.cors ?? "";
     const swaggerEnabled = swagger ? "true" : "false";
     const swaggerUiEnabled = swagger ? '["development"]' : "false";
     const graphqlEnabled = graphql ? "true" : "false";
     const graphiqlEnabled = graphql ? '["development"]' : "false";
-    
-    if (language === "typescript") {
-        let config = `import type { SprintOptions } from "sprint-es";
 
-export const config: SprintOptions = {
-    openapi: {
-        enabled: ${swaggerEnabled},
-        generateOnBuild: ${swaggerEnabled},
-        swaggerUi: {
-            enabled: ${swaggerUiEnabled}
-        }
-    },
-    graphql: {
-        enabled: ${graphqlEnabled},
-        graphiql: {
-            enabled: ${graphiqlEnabled}
-        }
-    }
-};
+    const corsBlock = buildCorsBlock(corsInput);
 
-// To use GraphQL, create a schema at src/graphql/schema.ts and import it here
-// import { GraphQLSchema } from "graphql";
-// export const graphqlSchema = new GraphQLSchema({ ... });
-`;
+    const isTs = language === "typescript";
+    const importLine = isTs ? `import type { SprintOptions } from "sprint-es";\n\n` : "";
+    const exportLine = isTs ? `export const config: SprintOptions = {` : `export const config = {`;
 
-        if (telemetry === "sentry" || telemetry === "glitchtip") {
-            config += `import { initTelemetry } from "sprint-es/telemetry";
+    let config = `${importLine}${exportLine}
+${corsBlock}
 
-initTelemetry({
-    provider: "${telemetry}",
-    dsn: process.env.SENTRY_DSN || "",
-    environment: process.env.NODE_ENV || "development"
-});
-`;
-        } else if (telemetry === "discord") {
-            config += `import { initTelemetry } from "sprint-es/telemetry";
+    security: {
+        hsts: { maxAge: 63072000, includeSubDomains: true }
+    },
 
-initTelemetry({
-    provider: "discord",
-    webhookUrl: process.env.DISCORD_TELEMETRY_WEBHOOK_URL || ""
-});
-`;
-        }
+    context: {
+        trustIncomingRequestId: true
+    },
 
-        return config;
-    }
+    errorHandler: {
+        includeStack: process.env.NODE_ENV !== "production"
+    },
+
+    shutdown: {
+        timeoutMs: 30_000
+    },
 
-    let config = `export const config = {
     openapi: {
         enabled: ${swaggerEnabled},
         generateOnBuild: ${swaggerEnabled},
@@ -88,6 +92,7 @@ initTelemetry({
             enabled: ${swaggerUiEnabled}
         }
     },
+
     graphql: {
         enabled: ${graphqlEnabled},
         graphiql: {
@@ -95,15 +100,10 @@ initTelemetry({
         }
     }
 };
-
-// To use GraphQL, create a schema at src/graphql/schema.js and import it here
-// import { GraphQLSchema } from "graphql";
-// export const graphqlSchema = new GraphQLSchema({ ... });
 `;
 
     if (telemetry === "sentry" || telemetry === "glitchtip") {
-        config += `
-import { initTelemetry } from "sprint-es/telemetry";
+        config += `\nimport { initTelemetry } from "sprint-es/telemetry";
 
 initTelemetry({
     provider: "${telemetry}",
@@ -112,8 +112,7 @@ initTelemetry({
 });
 `;
     } else if (telemetry === "discord") {
-        config += `
-import { initTelemetry } from "sprint-es/telemetry";
+        config += `\nimport { initTelemetry } from "sprint-es/telemetry";
 
 initTelemetry({
     provider: "discord",
@@ -123,4 +122,4 @@ initTelemetry({
     }
 
     return config;
-};
+};

package/src/templates/controllers.ts

@@ -105,7 +105,7 @@ export function getUploadController(language: string) {
         return `import { Handler, SprintRequest, SprintResponse } from "sprint-es";
 
 export const uploadPdfController: Handler = (req: SprintRequest, res: SprintResponse) => {
-    const file = req.file;
+    const file = req.files?.document[0];
     
     if (!file) return res.status(400).json({ error: "No file uploaded" });
     

package/src/templates/index.ts

@@ -28,5 +28,8 @@ export { getDockerfile, getDockerCompose } from "./docker.js";
 // GraphQL
 export { getGraphQLFiles } from "./graphql.js";
 
+// Services (queue, cache, trpc, grpc, websocket scaffolds)
+export { getQueueService, getCacheService, getTrpcRouter, getGrpcServer, getWebSocketScaffold } from "./services.js";
+
 // Misc
 export { getGitignore, getDockerIgnore } from "./misc.js";

package/src/templates/packageJson.ts

@@ -1,4 +1,5 @@
 import * as crypto from "node:crypto";
+import type { ProjectFeatures } from "../index.js";
 
 export interface JWTKeys {
     publicKey: string;
@@ -14,9 +15,18 @@ export function generateJWTKeys(): JWTKeys {
     return keys;
 };
 
-export function getTypeScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean) {
+function applyFeatureDeps(deps: Record<string, string>, features?: Partial<ProjectFeatures>): void {
+    if (!features) return;
+    if (features.queue === "bullmq") deps["bullmq"] = "^5.0.0";
+    if (features.queue === "bullmq" || features.cache === "redis") deps["ioredis"] = "^5.0.0";
+    if (features.websocket) deps["ws"] = "^8.18.0";
+    if (features.trpc) deps["@trpc/server"] = "^11.0.0";
+    if (features.grpc) deps["@grpc/grpc-js"] = "^1.12.0";
+}
+
+export function getTypeScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean, features?: Partial<ProjectFeatures>) {
     const deps: Record<string, string> = {
-        "sprint-es": "^0.0.165"
+        "sprint-es": "^1.0.0"
     };
 
     const devDeps: Record<string, string> = {
@@ -41,6 +51,9 @@ export function getTypeScriptPackageJson(name: string, telemetry: string, swagge
         devDeps["@types/swagger-ui-express"] = "^4.1.8";
     }
 
+    applyFeatureDeps(deps, features);
+    if (features?.websocket) devDeps["@types/ws"] = "^8.5.10";
+
     return {
         name: name === "." ? "sprint-app" : name,
         version: "0.0.1",
@@ -74,14 +87,14 @@ export function getTypeScriptPackageJson(name: string, telemetry: string, swagge
     };
 };
 
-export function getJavaScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean) {
+export function getJavaScriptPackageJson(name: string, telemetry: string, swagger: boolean, graphql: boolean, features?: Partial<ProjectFeatures>) {
     const deps: Record<string, string> = {
-        "sprint-es": "^0.0.165"
+        "sprint-es": "^1.0.0"
     };
 
     if (telemetry === "sentry" || telemetry === "glitchtip") deps["@sentry/node"] = "^8.0.0";
     else if (telemetry === "discord") deps["axios"] = "^1.6.0";
-    
+
     if (swagger) deps["swagger-ui-express"] = "^5.0.0";
 
     if (graphql) {
@@ -90,6 +103,8 @@ export function getJavaScriptPackageJson(name: string, telemetry: string, swagge
         deps["ruru"] = "^2.0.0-rc.6";
     }
 
+    applyFeatureDeps(deps, features);
+
     return {
         name: name === "." ? "sprint-app" : name,
         version: "0.0.1",
@@ -105,4 +120,4 @@ export function getJavaScriptPackageJson(name: string, telemetry: string, swagge
         },
         dependencies: deps
     };
-};
+};

package/src/templates/routes.ts

@@ -1,34 +1,57 @@
-export function getMainFile(language: string, graphql: boolean = false) {
+export interface MainFileFeatures {
+    queue?: "none" | "memory" | "bullmq";
+    cache?: "none" | "memory" | "redis";
+    websocket?: boolean;
+    trpc?: boolean;
+    grpc?: boolean;
+    csrf?: boolean;
+}
+
+export function getMainFile(language: string, graphql: boolean = false, features?: MainFileFeatures): string {
     const isTs = language === "typescript";
-    
-    if (isTs) {
-        if (graphql) {
-            return `import Sprint from "sprint-es";
-import { graphqlSchema } from "./graphql/schema";
-
-const app = new Sprint();
-app.setGraphQLSchema(graphqlSchema);
-`;
-        }
-        return `import Sprint from "sprint-es";
+    const ext = isTs ? "" : ".js";
 
-const app = new Sprint();
-`;
-    }
+    const imports: string[] = [`import Sprint from "sprint-es";`];
+    const setup: string[] = [`const app = new Sprint();`];
 
     if (graphql) {
-        return `import Sprint from "sprint-es";
-import { graphqlSchema } from "./graphql/schema.js";
+        imports.push(`import { graphqlSchema } from "./graphql/schema${ext}";`);
+        setup.push(`app.setGraphQLSchema(graphqlSchema);`);
+    }
 
-const app = new Sprint();
-app.setGraphQLSchema(graphqlSchema);
-`;
+    if (features?.queue && features.queue !== "none") {
+        imports.push(`import "./services/queue${ext}";`);
+    }
+    if (features?.cache && features.cache !== "none") {
+        imports.push(`import "./services/cache${ext}";`);
+    }
+
+    if (features?.csrf) {
+        // CSRF is registered via defineMiddleware in src/middlewares/csrf.ts; just hint here
     }
 
-    return `import Sprint from "sprint-es";
+    if (features?.trpc) {
+        imports.push(`import { attachTrpc } from "sprint-es/trpc";`);
+        imports.push(`import { appRouter } from "./trpc/router${ext}";`);
+        setup.push(`await app.ready;`);
+        setup.push(`await attachTrpc({ app: app.app, router: appRouter });`);
+    }
 
-const app = new Sprint();
-`;
+    if (features?.websocket) {
+        imports.push(`import { attachWebSocket } from "sprint-es/ws";`);
+        imports.push(`import { chatHandler } from "./ws/chat${ext}";`);
+        setup.push(`{
+    const server = await app.onListen();
+    await attachWebSocket({ server, handlers: { "/ws/chat": chatHandler } });
+}`);
+    }
+
+    if (features?.grpc) {
+        imports.push(`import { startGrpcServer } from "./grpc/server${ext}";`);
+        setup.push(`startGrpcServer().catch(err => console.error("[grpc] failed to start", err));`);
+    }
+
+    return imports.join("\n") + "\n\n" + setup.join("\n") + "\n";
 };
 
 export function getHomeRoute(language: string) {

package/src/templates/services.ts

@@ -0,0 +1,270 @@
+type Lang = "typescript" | "javascript";
+
+export function getQueueService(language: Lang, choice: "memory" | "bullmq"): string {
+    if (choice === "bullmq") {
+        if (language === "typescript") {
+            return `import { defineQueue, BullMQQueue } from "sprint-es/queue";
+import { Queue, Worker } from "bullmq";
+import IORedis from "ioredis";
+
+const connection = new IORedis(process.env.REDIS_URL ?? "redis://127.0.0.1:6379", {
+    maxRetriesPerRequest: null
+});
+
+export interface EmailJob {
+    to: string;
+    subject: string;
+    body: string;
+}
+
+export const emails = defineQueue<EmailJob>({
+    name: "emails",
+    adapter: new BullMQQueue<EmailJob>({
+        queue: new Queue("emails", { connection }),
+        workerFactory: (proc) => new Worker("emails", proc, { connection, concurrency: 4 }),
+        defaultAttempts: 5
+    })
+});
+
+emails.process(async (job) => {
+    console.log(\`[emails] sending \${job.data.subject} to \${job.data.to} (attempt \${job.attemptsMade})\`);
+    // TODO: integrate your SMTP / provider here.
+});
+`;
+        }
+        return `import { defineQueue, BullMQQueue } from "sprint-es/queue";
+import { Queue, Worker } from "bullmq";
+import IORedis from "ioredis";
+
+const connection = new IORedis(process.env.REDIS_URL ?? "redis://127.0.0.1:6379", {
+    maxRetriesPerRequest: null
+});
+
+export const emails = defineQueue({
+    name: "emails",
+    adapter: new BullMQQueue({
+        queue: new Queue("emails", { connection }),
+        workerFactory: (proc) => new Worker("emails", proc, { connection, concurrency: 4 }),
+        defaultAttempts: 5
+    })
+});
+
+emails.process(async (job) => {
+    console.log(\`[emails] sending \${job.data.subject} to \${job.data.to} (attempt \${job.attemptsMade})\`);
+    // TODO: integrate your SMTP / provider here.
+});
+`;
+    }
+
+    // memory
+    if (language === "typescript") {
+        return `import { defineQueue } from "sprint-es/queue";
+
+export interface EmailJob {
+    to: string;
+    subject: string;
+    body: string;
+}
+
+export const emails = defineQueue<EmailJob>({ name: "emails" });
+
+emails.process(async (job) => {
+    console.log(\`[emails] sending \${job.data.subject} to \${job.data.to} (attempt \${job.attemptsMade})\`);
+    // TODO: integrate your SMTP / provider here.
+});
+`;
+    }
+    return `import { defineQueue } from "sprint-es/queue";
+
+export const emails = defineQueue({ name: "emails" });
+
+emails.process(async (job) => {
+    console.log(\`[emails] sending \${job.data.subject} to \${job.data.to} (attempt \${job.attemptsMade})\`);
+    // TODO: integrate your SMTP / provider here.
+});
+`;
+}
+
+export function getCacheService(language: Lang, choice: "memory" | "redis"): string {
+    if (choice === "redis") {
+        if (language === "typescript") {
+            return `import { defineCache, RedisCache } from "sprint-es/cache";
+import IORedis from "ioredis";
+
+const client = new IORedis(process.env.REDIS_URL ?? "redis://127.0.0.1:6379");
+
+export const cache = defineCache({
+    name: "main",
+    adapter: new RedisCache({ client, prefix: "app:cache:", defaultTtlMs: 60_000 })
+});
+`;
+        }
+        return `import { defineCache, RedisCache } from "sprint-es/cache";
+import IORedis from "ioredis";
+
+const client = new IORedis(process.env.REDIS_URL ?? "redis://127.0.0.1:6379");
+
+export const cache = defineCache({
+    name: "main",
+    adapter: new RedisCache({ client, prefix: "app:cache:", defaultTtlMs: 60_000 })
+});
+`;
+    }
+
+    // memory
+    if (language === "typescript") {
+        return `import { defineCache, MemoryCache } from "sprint-es/cache";
+
+export const cache = defineCache({
+    name: "main",
+    adapter: new MemoryCache({ maxEntries: 10_000, defaultTtlMs: 60_000 })
+});
+`;
+    }
+    return `import { defineCache, MemoryCache } from "sprint-es/cache";
+
+export const cache = defineCache({
+    name: "main",
+    adapter: new MemoryCache({ maxEntries: 10_000, defaultTtlMs: 60_000 })
+});
+`;
+}
+
+export function getTrpcRouter(language: Lang): string {
+    if (language === "typescript") {
+        return `import { initTRPC } from "@trpc/server";
+import { z } from "sprint-es/schemas";
+
+const t = initTRPC.create();
+
+export const appRouter = t.router({
+    hello: t.procedure
+        .input(z.object({ name: z.string() }))
+        .query(({ input }) => ({ greeting: \`Hello, \${input.name}!\` })),
+
+    createUser: t.procedure
+        .input(z.object({ email: z.string().email(), name: z.string().min(1) }))
+        .mutation(async ({ input }) => {
+            // TODO: persist user
+            return { id: crypto.randomUUID(), ...input };
+        })
+});
+
+export type AppRouter = typeof appRouter;
+`;
+    }
+    return `import { initTRPC } from "@trpc/server";
+import { z } from "sprint-es/schemas";
+
+const t = initTRPC.create();
+
+export const appRouter = t.router({
+    hello: t.procedure
+        .input(z.object({ name: z.string() }))
+        .query(({ input }) => ({ greeting: \`Hello, \${input.name}!\` })),
+
+    createUser: t.procedure
+        .input(z.object({ email: z.string().email(), name: z.string().min(1) }))
+        .mutation(async ({ input }) => {
+            return { id: crypto.randomUUID(), ...input };
+        })
+});
+`;
+}
+
+export function getGrpcServer(language: Lang): string {
+    if (language === "typescript") {
+        return `import { createGrpcServer } from "sprint-es/grpc";
+import * as grpc from "@grpc/grpc-js";
+
+// Minimal greeter service using a service definition.
+// Replace with proto-loaded service in production via @grpc/proto-loader.
+const greeterServiceDefinition: grpc.ServiceDefinition = {
+    SayHello: {
+        path: "/Greeter/SayHello",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (v: { name: string }) => Buffer.from(JSON.stringify(v)),
+        requestDeserialize: (b: Buffer) => JSON.parse(b.toString()),
+        responseSerialize: (v: { message: string }) => Buffer.from(JSON.stringify(v)),
+        responseDeserialize: (b: Buffer) => JSON.parse(b.toString())
+    }
+};
+
+export async function startGrpcServer() {
+    return await createGrpcServer({
+        address: process.env.GRPC_ADDRESS ?? "0.0.0.0:50051",
+        services: [
+            {
+                service: greeterServiceDefinition,
+                implementation: {
+                    SayHello: (call: grpc.ServerUnaryCall<{ name: string }, { message: string }>, callback: grpc.sendUnaryData<{ message: string }>) => {
+                        callback(null, { message: \`Hello, \${call.request.name}!\` });
+                    }
+                }
+            }
+        ]
+    });
+}
+`;
+    }
+    return `import { createGrpcServer } from "sprint-es/grpc";
+
+const greeterServiceDefinition = {
+    SayHello: {
+        path: "/Greeter/SayHello",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (v) => Buffer.from(JSON.stringify(v)),
+        requestDeserialize: (b) => JSON.parse(b.toString()),
+        responseSerialize: (v) => Buffer.from(JSON.stringify(v)),
+        responseDeserialize: (b) => JSON.parse(b.toString())
+    }
+};
+
+export async function startGrpcServer() {
+    return await createGrpcServer({
+        address: process.env.GRPC_ADDRESS ?? "0.0.0.0:50051",
+        services: [
+            {
+                service: greeterServiceDefinition,
+                implementation: {
+                    SayHello: (call, callback) => {
+                        callback(null, { message: \`Hello, \${call.request.name}!\` });
+                    }
+                }
+            }
+        ]
+    });
+}
+`;
+}
+
+export function getWebSocketScaffold(language: Lang): string {
+    if (language === "typescript") {
+        return `import type { WebSocketHandler, WebSocket } from "sprint-es/ws";
+
+export const chatHandler: WebSocketHandler = {
+    onConnection: (socket: WebSocket, request) => {
+        console.log(\`[ws] client connected from \${request.socket.remoteAddress}\`);
+        socket.on("message", (raw) => {
+            const text = raw.toString();
+            socket.send(JSON.stringify({ echo: text, ts: Date.now() }));
+        });
+        socket.on("close", () => console.log("[ws] client disconnected"));
+    }
+};
+`;
+    }
+    return `export const chatHandler = {
+    onConnection: (socket, request) => {
+        console.log(\`[ws] client connected from \${request.socket.remoteAddress}\`);
+        socket.on("message", (raw) => {
+            const text = raw.toString();
+            socket.send(JSON.stringify({ echo: text, ts: Date.now() }));
+        });
+        socket.on("close", () => console.log("[ws] client disconnected"));
+    }
+};
+`;
+}