rajt 0.0.91 → 0.0.92

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.91",
+  "version": "0.0.92",
   "type": "module",
   "main": "./src/index.ts",
   "bin": {

package/src/cli/commands/migrate.ts

@@ -2,7 +2,7 @@ import { defineCommand } from 'citty'
 import { spawn } from 'node:child_process'
 import { Migrator } from 'forj'
 import { gray } from '../../utils/colors'
-import { _root, getRuntime, cleanDir, d1Path, wait as WAIT } from '../utils'
+import { _root, getRuntime, cleanDB } from '../utils'
 import { wait, info, event, rn, error, log } from '../../utils/log'
 
 export default defineCommand({
@@ -41,8 +41,7 @@ export default defineCommand({
 					wait('Running migrations')
 
 					if (action.includes('fresh')) {
-						cleanDir(d1Path)
-						await WAIT(2000)
+						cleanDB(database)
 					}
 
 					await Migrator.compile([...migrated, ...pending])

package/src/cli/utils.ts

@@ -3,6 +3,7 @@ import { Miniflare } from 'miniflare'
 import { mkdirSync, existsSync, statSync, readdirSync, rmSync, unlinkSync, copyFileSync, writeFileSync } from 'node:fs'
 import { readFile, stat, writeFile } from 'node:fs/promises'
 import { basename, dirname, join, relative } from 'node:path'
+import crypto, { createHash } from 'node:crypto'
 
 import { findWranglerConfig, parseWranglerConfig, WRANGLER_CONFIG_FILES } from 'localflare-core'
 import type { WranglerConfig, LocalflareManifest } from 'localflare-core'
@@ -197,6 +198,37 @@ export function cleanDir(path: string) {
   } catch {}
 }
 
+function durableObjectNamespace(name: string, uniqueKey: string) {
+  const key = crypto.createHash('sha256').update(uniqueKey).digest()
+  const nameHmac = crypto.createHmac('sha256', key).update(name).digest().subarray(0, 16)
+  return Buffer.concat([
+    nameHmac,
+    crypto.createHmac('sha256', key).update(nameHmac).digest().subarray(0, 16)
+  ]).toString('hex')
+}
+
+export function cleanDB(key: string, config?: WranglerConfig) {
+  config ??= wranglerConfig()
+  if (!config?.d1_databases) return
+  for (const db of config.d1_databases) {
+    if (key == db.database_name || key == db.binding) {
+      const ns = 'miniflare-D1DatabaseObject'
+      const fileName = join(ns, durableObjectNamespace(db.preview_database_id || db.database_id || db.binding, ns) +'.sqlite')
+
+      for (const file of [
+        fileName,
+        fileName +'-shm',
+        fileName +'-wal',
+      ]) {
+        const filePath = join(d1Path, file)
+        console.log('filePath:', filePath)
+        if (!existsSync(filePath)) continue
+        unlinkSync(filePath)
+      }
+    }
+  }
+}
+
 export function wranglerConfig(file: string | null = null) {
   file ??= findWranglerConfig(_root)
   if (!file) {

package/src/oas.ts

@@ -8,7 +8,7 @@ import response from './response'
 import { getHandler } from './register'
 import type { Hono } from './types'
 
-// @ts-ignore
+// @ts-ignore TODO: remove dependency of 'package.json'...
 import packageJson from '../../../package.json'
 
 export default class OAS {