miqro 7.1.0 → 7.2.0

package/src/services/hot-reload.ts

@@ -1,9 +1,8 @@
 //import { checkEnvVariable } from "@miqro/core";
 
-import { HOT_RELOAD_PATH } from "../common/constants.js";
+import { HOT_RELOAD_PATH, HOT_RELOAD_SCRIPT_PATH } from "../common/constants.js";
 
-export function getHotReloadScript() {
-  const HOT_RELOAD_JS_SCRIPT = `
+export const HOT_RELOAD_JS_SCRIPT = `
 // Create WebSocket connection.
 
 function getSocket() {
@@ -13,13 +12,14 @@ function getSocket() {
 const socket = getSocket();
 
 let timeout;
+let reloadtimeout;
 
 function tryConnection() {
     try {
         const newSocket = getSocket();
         newSocket.addEventListener("open", (event) => {
             console.log("reloading");
-            setTimeout(()=>{
+            reloadtimeout = setTimeout(()=>{
               window.location.reload();
             }, 500);
             
@@ -37,13 +37,17 @@ function tryConnection() {
 // Connection closed
 socket.addEventListener("close", (event) => {
     clearTimeout(timeout);
+    clearTimeout(reloadtimeout);
     timeout = setTimeout(tryConnection, 500);
 });
 
 socket.addEventListener("error", (err) => {
+    clearTimeout(reloadtimeout);
     console.error(err);
 });`;
-  return `<script>${HOT_RELOAD_JS_SCRIPT}</script>`;
+
+export function getHotReloadScript() {
+  return `<script src="${HOT_RELOAD_SCRIPT_PATH}"></script>`;
 }
 
 /*export function isHotReloadEnabled() {

package/src/services/migrations.ts

@@ -5,16 +5,16 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { cwd } from "node:process";
 
 import { getMigrationsPath } from "../common/paths.js";
-import { importJSXFile, inflateJSX } from "../common/jsx.js";
+import { importJSXFile, ImportJSXFileOptions, inflateJSX } from "../common/jsx.js";
 
-export async function runMigrations(logger: Logger | undefined, db: Database | null, servicePath: string, service: string, inflateDir: string | undefined | false, migrations: string[]) {
+export async function runMigrations(logger: Logger | undefined, db: Database | null, servicePath: string, service: string, inflateDir: string | undefined | false, migrations: string[], options: ImportJSXFileOptions) {
   const migrationsFolderPath = getMigrationsPath(servicePath);
   if (migrationsFolderPath) {
     logger?.debug("running migrations from [%s]", service);
     if (!db) {
       throw new Error("cannot run migrations with the database disabled!");
     }
-    const serviceMigrations = await migration.up.folder(db as any, migrationsFolderPath, logger as DatabaseLogger, (inFile: string) => importJSXFile(inFile, logger));
+    const serviceMigrations = await migration.up.folder(db as any, migrationsFolderPath, logger as DatabaseLogger, (inFile: string) => importJSXFile(inFile, options, logger));
     migrations.push(...serviceMigrations);
 
     if (inflateDir) {
@@ -37,14 +37,14 @@ export async function runMigrations(logger: Logger | undefined, db: Database | n
   return migrations;
 }
 
-export async function runMigrationsDown(logger: Logger | Console | undefined, db: Database | null, servicePath: string, service: string, inflateDir: string | undefined, migrations: string[]) {
+export async function runMigrationsDown(logger: Logger | Console | undefined, db: Database | null, servicePath: string, service: string, inflateDir: string | undefined, migrations: string[], options: ImportJSXFileOptions) {
   const migrationsFolderPath = getMigrationsPath(servicePath)
   if (migrationsFolderPath) {
     logger?.debug("running migrations from [%s]", service);
     if (!db) {
       throw new Error("cannot run migrations with the database disabled!");
     }
-    const serviceMigrations = await migration.down.folder(db as any, migrationsFolderPath, logger as DatabaseLogger, (inFile: string) => importJSXFile(inFile, logger));
+    const serviceMigrations = await migration.down.folder(db as any, migrationsFolderPath, logger as DatabaseLogger, (inFile: string) => importJSXFile(inFile, options, logger));
     migrations.push(...serviceMigrations);
 
     if (inflateDir) {