rajt 0.0.57 → 0.0.58

package/README.md

@@ -1,7 +1,7 @@
-<h1 align="left">Rajt λ<br/><a href="https://pr.new/attla/rajt"><img align="right" src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a><a href="https://npmjs.com/package/rajt"><img align="right" src="https://img.shields.io/npm/v/rajt.svg" alt="npm package"></a></h1>
+<h1 align="left">λ Rajt<br/><a href="https://pr.new/attla/rajt"><img align="right" src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a><a href="https://npmjs.com/package/rajt"><img align="right" src="https://img.shields.io/npm/v/rajt.svg" alt="npm package"></a></h1>
 <br/>
 
-> This framework is fully geared towards the serverless world, specifically AWS Lambda (Node.js and LLRT) / Cloudflare Workers.
+> This framework is fully geared towards the serverless world, specifically AWS Lambda (Node.js, Bun and LLRT runtime) / Cloudflare Workers.
 
 - 💡 Instant Server Start
 - ⚡️ Fast Cold Start
@@ -9,12 +9,15 @@
 
 [Read the Docs to Learn More](https://github.com/attla/rajt/blob/main/DOCS.md)
 
-## Packages
+## Ecosystem Packages
 
-| Package                                             | Version                                                                        |
-| --------------------------------------------------- | :----------------------------------------------------------------------------- |
-| [rajt](https://github.com/attla/rajt)               | ![rajt version](https://img.shields.io/npm/v/rajt.svg?label=%20)               |
-| [create-rajt](https://github.com/attla/create-rajt) | ![create-rajt version](https://img.shields.io/npm/v/create-rajt.svg?label=%20) |
+| Package | Version | Description |
+| -: | :- | :- |
+| [rajt](https://github.com/attla/rajt) | [![rajt version](https://img.shields.io/npm/v/rajt.svg?label=%20)](https://npm.im/rajt) | 🧱 The core of Rajt serverless framework. |
+| [create-rajt](https://github.com/attla/create-rajt) | [![create-rajt version](https://img.shields.io/npm/v/create-rajt.svg?label=%20)](https://npm.im/create-rajt) | 📁 CLI tool for create new Rajt projects, from starter templates. |
+| [forj](https://github.com/attla/forj) | [![forj version](https://img.shields.io/npm/v/forj.svg?label=%20)](https://npm.im/forj) | 🗂️ Just another query builder in typescript |
+| [t0n](https://github.com/attla/t0n) | [![t0n version](https://img.shields.io/npm/v/t0n.svg?label=%20)](https://npm.im/t0n) | 🧰 Collection of elegant typescript resources for web artisans. |
+| [cripta](https://github.com/attla/cripta) | [![cripta version](https://img.shields.io/npm/v/cripta.svg?label=%20)](https://npm.im/cripta) | 🧛 A layer of encryption a little too judicious. |
 
 ## License
 

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "type": "module",
   "main": "dist/index.js",
+  "bin": {
+    "rajt": "./src/bin/rajt.js"
+  },
   "exports": {
     ".": "./src/index.ts",
     "./auth": "./src/auth/index.ts",
@@ -18,6 +21,7 @@
     "src"
   ],
   "scripts": {
+    "rajt": "./src/bin/rajt.js",
     "dev": "tsx watch src/dev.ts",
     "aws:build": "bun run --silent cache:routes && bun run --silent aws:export && bun run --silent clean:temp",
     "cf:build": "bun run --silent cache:routes && bun run --silent cf:export && bun run --silent clean:temp",
@@ -33,7 +37,7 @@
     "sam:package": "sam package --template-file ../../template-prod.yaml --output-template-file ../../packaged.yaml",
     "sam:deploy": "sam deploy --template-file ../../packaged.yaml --stack-name rajt-llrt --capabilities CAPABILITY_IAM",
     "sam:update": "source ../../.env.prod && aws lambda update-function-code --function-name $AWS_NAME --zip-file fileb://../../lambda.zip --region $AWS_REGION --no-cli-pager 2>&1 >/dev/null",
-    "cf:local": "bun run --silent cf:build && cd ../../dist && bunx wrangler dev",
+    "cf:local-": "source ../../.env.dev && bun run --silent cf:build:watch -- cd ../../dist && bunx wrangler dev --port=$PORT --persist-to='../.wrangler/state'",
     "cf:deploy": "bun run --silent cf:build && cd ../../dist && bunx wrangler deploy",
     "cache:routes": "tsx src/scripts/cache-routes.ts",
     "ensure-dirs": "rm -rf ../../dist ../../tmp && mkdir -p ../../tmp && chmod 755 ../../tmp && mkdir -p ../../dist && chmod 755 ../../dist",
@@ -46,22 +50,38 @@
   "dependencies": {
     "@aws-sdk/client-dynamodb": "3.817.0",
     "@aws-sdk/lib-dynamodb": "3.817.0",
-    "@hono/node-server": "^1.14.1",
     "@hono/zod-validator": "^0.4.3",
+    "cripta": "^0.1",
+    "hono": "^4.7.6",
+    "pluralize": "^8.0",
+    "t0n": "^0.1.5",
+    "ua-parser-js": "^2.0.4"
+  },
+  "devDependencies": {
+    "@cloudflare/workers-types": "^4.20251230.0",
+    "@hono/node-server": "^1.14.1",
+    "@iarna/toml": "^2.2.5",
+    "@miniflare/core": "^2.14.4",
+    "@miniflare/d1": "^2.14.4",
+    "@miniflare/durable-objects": "^2.14.4",
+    "@miniflare/kv": "^2.14.4",
+    "@miniflare/r2": "^2.14.4",
+    "@miniflare/scheduler": "^2.14.4",
+    "@miniflare/sites": "^2.14.4",
+    "@miniflare/storage-file": "^2.14.4",
+    "@miniflare/web-sockets": "^2.14.4",
     "@types/node": "^20.11.0",
+    "@types/pluralize": "^0.0.33",
+    "bun-types": "^1.2.14",
     "chokidar-cli": "^3.0.0",
-    "cripta": "^0.1",
+    "citty": "^0.1.6",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
-    "hono": "^4.7.6",
-    "plur": "^5.1.0",
-    "tsconfig-paths": "^4.2.0",
+    "miniflare": "^4.20251217.0",
+    "picocolors": "^1.1.1",
     "tsx": "^4.19.3",
     "typescript": "^5.8.3",
-    "ua-parser-js": "^2.0.4"
-  },
-  "devDependencies": {
-    "bun-types": "^1.2.14"
+    "wrangler": "^4.56.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/bin/rajt.js

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+import { spawn } from "node:child_process";
+import { join, dirname } from "node:path";
+import { existsSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const ERR_NODE_VERSION = "18.0.0";
+const MIN_NODE_VERSION = "18.0.0";
+
+let rajtProcess;
+
+// Executes ../src/cli/index.ts
+function runRajt() {
+  if (semiver(process.versions.node, ERR_NODE_VERSION) < 0) {
+    console.error(
+      `Rajt requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of Node.js.
+
+Consider using a Node.js version manager such as https://volta.sh or https://github.com/nvm-sh/nvm.`
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  const tsxPaths = [
+    // join(__dirname, "../node_modules/.bin/tsx"),
+    // join(__dirname, "../../.bin/tsx"),
+    join(__dirname, "../node_modules/.bin/tsx"),
+    join(__dirname, "../../node_modules/.bin/tsx"),
+    join(process.cwd(), "node_modules/.bin/tsx"),
+    "tsx",
+  ];
+
+  let tsxPath;
+  for (const pathOption of tsxPaths) {
+    if (pathOption === "tsx" || existsSync(pathOption)) {
+      tsxPath = pathOption;
+      break;
+    }
+  }
+
+  if (!tsxPath) {
+    console.error("TypeScript file found but tsx is not available. Please install tsx:");
+    console.error("  npm i -D tsx");
+    console.error("  or");
+    console.error("  bun i -D tsx");
+    process.exit(1);
+    return;
+  }
+
+  return spawn(
+    process.execPath,
+    [
+      "--no-warnings",
+      ...process.execArgv,
+      tsxPath,
+      join(__dirname, "../rajt/src/cli/index.ts"),
+      ...process.argv.slice(2),
+    ].filter(arg =>
+      !arg.includes('experimental-vm-modules') &&
+      !arg.includes('loader')
+    ),
+    {
+      stdio: ["inherit", "inherit", "inherit", "ipc"],
+      env: {
+        ...process.env,
+        NODE_ENV: process.env.NODE_ENV || 'development',
+        TSX_DISABLE_CACHE: process.env.TSX_DISABLE_CACHE || '1',
+      }
+    }
+  )
+    .on("exit", (code) =>
+      process.exit(code === undefined || code === null ? 0 : code)
+    )
+    .on("message", (message) => {
+      if (process.send) {
+        process.send(message);
+      }
+    })
+    .on("disconnect", () => {
+      if (process.disconnect) {
+        process.disconnect();
+      }
+    });
+}
+
+var fn = new Intl.Collator(0, { numeric: 1 }).compare;
+
+function semiver(a, b, bool) {
+  a = a.split(".");
+  b = b.split(".");
+
+  return (
+    fn(a[0], b[0]) ||
+    fn(a[1], b[1]) ||
+    ((b[2] = b.slice(2).join(".")),
+      (bool = /[.-]/.test((a[2] = a.slice(2).join(".")))),
+      bool == /[.-]/.test(b[2]) ? fn(a[2], b[2]) : bool ? -1 : 1)
+  );
+}
+
+function directly() {
+  try {
+    return ![typeof require, typeof module].includes('undefined') && require.main == module
+      || import.meta.url == `file://${process.argv[1]}`
+      || process.argv[1].endsWith(process.env?.npm_package_bin_rajt)
+      || import.meta?.url?.endsWith(process.env?.npm_package_bin_rajt)
+  } catch {
+    return false
+  }
+}
+
+if (directly()) {
+  rajtProcess = runRajt();
+  process.on("SIGINT", () => {
+    rajtProcess && rajtProcess.kill();
+  });
+  process.on("SIGTERM", () => {
+    rajtProcess && rajtProcess.kill();
+  });
+}

package/src/cli/commands/dev/index.ts

@@ -0,0 +1,294 @@
+import { existsSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { dirname, join, relative } from 'node:path'
+import { spawn, type ChildProcess } from 'node:child_process'
+
+import chokidar from 'chokidar'
+import colors from 'picocolors'
+import { defineCommand } from 'citty'
+import type { ChokidarEventName } from '../../types'
+
+import type { Miniflare } from 'miniflare'
+import { build, createMiniflare } from './utils'
+import { getAvailablePort } from '../../../utils/port'
+import shutdown from '../../../utils/shutdown'
+
+const __dirname = join(dirname(fileURLToPath(import.meta.url)), '../../../../../../')
+
+export default defineCommand({
+	meta: {
+		name: 'dev',
+		description: '💻 Start the localhost server\n',
+	},
+	args: {
+		port: {
+			description: 'Port to listen on',
+			type: 'number',
+			default: 3000,
+		},
+		host: {
+			description: 'Host to forward requests to, defaults to the zone of project',
+			type: 'string',
+			default: 'localhost',
+		},
+		platform: {
+			alias: 'p',
+			description: 'Environment platform',
+			type: 'enum',
+			options: ['aws', 'cf', 'node'] as const,
+			required: true,
+		},
+	},
+	async run({ args }) {
+		const platform = args.p || args.platform
+		const desiredPort = args.port ? Number(args.port) : 3000
+		const host = args.host ? String(args.host) : 'localhost'
+		switch (platform) {
+			case 'aws':
+				return withPort(desiredPort, async (port) => {
+					let isBuilding = false
+					let lambda: ChildProcess | null = null
+
+					const buildLambda = async () => {
+						if (isBuilding) return
+						isBuilding = true
+						logger.step('Building lambda')
+						try {
+							await build(platform)
+							if (!lambda) await startLambda()
+						} catch (e) {
+							logger.error('Build failed:', e)
+							process.exit(0)
+						} finally {
+							isBuilding = false
+						}
+					}
+
+					const stopLambda = async () => {
+						if (!lambda) return
+						logger.step('Stopping lambda process...')
+						try {
+							if (!lambda?.killed) {
+								lambda.kill('SIGTERM')
+								await wait(1000)
+
+								if (!lambda?.killed) { // force kill
+									lambda.kill('SIGKILL')
+									await wait(1000)
+								}
+							}
+
+							lambda = null
+						} catch (e) {
+							logger.warn('Error stopping lambda:', e)
+						}
+					}
+
+					const startLambda = async () => {
+						await stopLambda()
+
+						lambda = spawn(
+							'sam',
+							[
+								'local', 'start-api',
+								'--warm-containers', 'LAZY',
+								'--debug', '--template-file', join(__dirname, 'template-dev.yaml'),
+								'--port', args.port,
+							],
+							{
+								stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+								// stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+								shell: process.platform == 'win32',
+								env: {...process.env, DOCKER_HOST: getDockerHost()},
+							}
+						).on('exit', code => {
+							logger.step(`Lambda process exited with code ${code ?? 0}`)
+							if (code !== 0 && code !== null)
+								logger.error('Lambda process crashed, waiting for restart...')
+
+							lambda = null
+						})
+						.on('message', msg => {
+							if (process.send) process.send(msg)
+						}).on('disconnect', () => {
+							if (process.disconnect) process.disconnect()
+						}).on('error', e => {
+							logger.error('Lambda process error:', e)
+							lambda = null
+						})
+
+						await wait(2000)
+
+						logger.step('Lambda process started successfully')
+					}
+
+					await buildLambda()
+					logger.step(`API running on http://${host}:${port}`)
+
+					watch(async () => {
+						await buildLambda()
+					})
+
+					shutdown(async () => {
+						await stopLambda()
+					})
+				})
+			case 'cf':
+				return withPort(desiredPort, async (port) => {
+					let isBuilding = false
+
+					const buildWorker = async () => {
+						if (isBuilding) return
+						isBuilding = true
+						logger.step('Building worker')
+						try {
+							await build(platform)
+							await startWorker()
+						} catch (e) {
+							logger.error('Build failed:', e)
+							process.exit(0)
+						} finally {
+							isBuilding = false
+						}
+					}
+
+					let worker: Miniflare | null = null
+					const startWorker = async () => {
+						if (worker) await worker.dispose()
+
+						worker = await createMiniflare({ port, host, liveReload: false })
+					}
+
+					await buildWorker()
+					logger.step(`API running on http://${host}:${port}`)
+
+					watch(async () => {
+						logger.step('Restarting server')
+						await buildWorker()
+						logger.step('Server restarted')
+					})
+				})
+			case 'node':
+				return withPort(desiredPort, async (port) => {
+					logger.step(`API running on http://${host}:${port}`)
+
+					spawn(
+						process.execPath,
+						[
+							join(__dirname, 'node_modules/.bin/tsx'), 'watch', join(__dirname, 'node_modules/rajt/src/dev.ts'),
+						],
+						{
+							stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+							env: {...process.env, PORT: args.port},
+						}
+					).on('exit', code => process.exit(code ?? 0))
+					.on('message', msg => {
+						if (process.send) process.send(msg)
+					}).on('disconnect', () => {
+						if (process.disconnect) process.disconnect()
+					})
+				})
+			default:
+				return logger.warn(
+					`🟠 Provide a valid platform: ${['aws', 'cf', 'node'].map(p => colors.blue(p)).join(', ')}.\n`
+				)
+    }
+	},
+})
+
+function withPort(desiredPort: number, cb: (port: number) => void) {
+	getAvailablePort(desiredPort)
+		.then((port: number) => {
+			if (port != desiredPort)
+				logger.warn(`Port ${desiredPort} was in use, using ${port} as a fallback`)
+
+			cb(port)
+		}).catch(e => logger.error('Error finding available port:', e))
+}
+
+function getAssetChangeMessage(
+	e: ChokidarEventName,
+	path: string
+): string {
+	path = relative(__dirname, path)
+	switch (e) {
+		case 'add':
+			return `File ${path} was added`
+		case 'addDir':
+			return `Directory ${path} was added`
+		case 'unlink':
+			return `File ${path} was removed`
+		case 'unlinkDir':
+			return `Directory ${path} was removed`
+		case 'change':
+		default:
+			return `${path} changed`
+	}
+}
+
+async function watch(cb: (e: ChokidarEventName | string, file: string) => Promise<void>) {
+	const codeWatcher = chokidar.watch([
+		join(__dirname, 'actions/**/*.ts'),
+		join(__dirname, 'configs/**/*.ts'),
+		join(__dirname, 'enums/**/*.ts'),
+		join(__dirname, 'locales/**/*.ts'),
+		join(__dirname, 'middlewares/**/*.ts'),
+		join(__dirname, 'models/**/*.ts'),
+		join(__dirname, 'utils/**/*.ts'),
+		join(__dirname, '.env.dev'),
+		join(__dirname, '.env.prod'),
+		join(__dirname, 'package.json'),
+		join(__dirname, 'wrangler.toml'),
+	], {
+		ignored: /(^|[/\\])\../, // ignore hidden files
+		persistent: true,
+		ignoreInitial: true,
+		awaitWriteFinish: {
+			stabilityThreshold: 200,
+			pollInterval: 100,
+		},
+	})
+	let restartTimeout: NodeJS.Timeout | null = null
+
+	const watcher = (e: ChokidarEventName) => async (file: string) => {
+		logger.step(getAssetChangeMessage(e, file))
+
+		if (restartTimeout)
+			clearTimeout(restartTimeout)
+
+		restartTimeout = setTimeout(async () => {
+			await cb(e, file)
+		}, 300)
+	}
+
+	codeWatcher.on('change', watcher('change'))
+	codeWatcher.on('add', watcher('add'))
+	codeWatcher.on('unlink', watcher('unlink'))
+	codeWatcher.on('addDir', watcher('addDir'))
+	codeWatcher.on('unlinkDir', watcher('unlinkDir'))
+
+	logger.step('Watching for file changes')
+}
+
+async function wait(ms: number) {
+	return new Promise(r => setTimeout(r, ms))
+}
+
+function getDockerHost() {
+	const platform = process.platform
+
+	if (platform === 'darwin') {
+		for (const socket of [
+			'/Users/'+ process.env.USER +'/.docker/run/docker.sock',
+			'/var/run/docker.sock',
+			process.env.DOCKER_HOST
+		]) {
+			if (socket && existsSync(socket.replace(/^unix:\/\//, '')))
+				return socket.includes('://') ? socket : `unix://${socket}`
+		}
+
+		return 'tcp://localhost:2375'
+	}
+
+	return process.env.DOCKER_HOST || (platform == 'win32' ? 'tcp://localhost:2375' : 'unix:///var/run/docker.sock')
+}