arri 0.57.0 → 0.57.3

package/dist/cli.cjs

@@ -11,7 +11,7 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const dev = require('./shared/arri.42cdc72b.cjs');
+const dev = require('./shared/arri.976d7393.cjs');
 const ofetch = require('ofetch');
 const Degit = require('degit');
 const enquirer = require('enquirer');

package/dist/cli.mjs

@@ -9,7 +9,7 @@ import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { d as defaultConfig, l as logger, s as setupWorkingDir, c as createAppWithRoutesModule, O as OUT_CODEGEN, e as OUT_SERVER_ENTRY, G as GEN_APP_FILE, f as OUT_APP_FILE, i as isArriConfig, g as getArriPackageMetadata, h as dev } from './shared/arri.e6e562ed.mjs';
+import { d as defaultConfig, l as logger, s as setupWorkingDir, c as createAppWithRoutesModule, O as OUT_CODEGEN, e as OUT_SERVER_ENTRY, G as GEN_APP_FILE, f as OUT_APP_FILE, i as isArriConfig, g as getArriPackageMetadata, h as dev } from './shared/arri.1de410ff.mjs';
 import { ofetch } from 'ofetch';
 import Degit from 'degit';
 import enquirer from 'enquirer';

package/dist/index.cjs

@@ -4,19 +4,19 @@ const codegenDart = require('@arrirpc/codegen-dart');
 const codegenKotlin = require('@arrirpc/codegen-kotlin');
 const codegenRust = require('@arrirpc/codegen-rust');
 const codegenTs = require('@arrirpc/codegen-ts');
-const dev = require('./shared/arri.42cdc72b.cjs');
+const dev = require('./shared/arri.976d7393.cjs');
 const codegenUtils = require('@arrirpc/codegen-utils');
 require('node:fs');
-require('node:fs/promises');
 require('@joshmossas/listhen');
 require('c12');
 require('citty');
 require('esbuild');
 require('h3');
-require('ofetch');
 require('pathe');
+require('node:fs/promises');
 require('@arrirpc/schema');
 require('consola');
+require('ofetch');
 require('prettier');
 
 const generators = {

package/dist/index.mjs

@@ -2,19 +2,19 @@ import { dartClientGenerator } from '@arrirpc/codegen-dart';
 import { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
 import { rustClientGenerator } from '@arrirpc/codegen-rust';
 import { typescriptClientGenerator } from '@arrirpc/codegen-ts';
-export { D as DEV_DEFINITION_ENDPOINT, d as defaultConfig, b as defineConfig, i as isArriConfig, a as isResolvedArriConfig } from './shared/arri.e6e562ed.mjs';
+export { D as DEV_DEFINITION_ENDPOINT, d as defaultConfig, b as defineConfig, i as isArriConfig, a as isResolvedArriConfig } from './shared/arri.1de410ff.mjs';
 export { createAppDefinition } from '@arrirpc/codegen-utils';
 import 'node:fs';
-import 'node:fs/promises';
 import '@joshmossas/listhen';
 import 'c12';
 import 'citty';
 import 'esbuild';
 import 'h3';
-import 'ofetch';
 import 'pathe';
+import 'node:fs/promises';
 import '@arrirpc/schema';
 import 'consola';
+import 'ofetch';
 import 'prettier';
 
 const generators = {

package/dist/shared/{arri.e6e562ed.mjs → arri.1de410ff.mjs}

@@ -1,20 +1,19 @@
 import { existsSync } from 'node:fs';
-import fs from 'node:fs/promises';
-import { camelCase, removeDisallowedChars, kebabCase, isAppDefinition } from '@arrirpc/codegen-utils';
-import { listenAndWatch } from '@joshmossas/listhen';
+import { listen } from '@joshmossas/listhen';
 import { loadConfig } from 'c12';
 import { defineCommand } from 'citty';
 import * as esbuild from 'esbuild';
-import 'h3';
-import { ofetch } from 'ofetch';
+import { dynamicEventHandler, toNodeListener, fromNodeMiddleware } from 'h3';
 import path from 'pathe';
+import fs from 'node:fs/promises';
+import { camelCase, removeDisallowedChars, kebabCase } from '@arrirpc/codegen-utils';
 import { a, ValidationError } from '@arrirpc/schema';
 import { createConsola } from 'consola';
+import { ofetch } from 'ofetch';
 import prettier from 'prettier';
 
 const logger = createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.ts";
-const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
 const OUT_APP_FILE = "app.mjs";
 const OUT_SERVER_ENTRY = "server.mjs";
 const OUT_CODEGEN = "codegen.mjs";
@@ -290,7 +289,6 @@ const dev = defineCommand({
     }
   },
   async run({ args }) {
-    process.env.ARRI_DEV_MODE = "true";
     const { config } = await loadConfig({
       configFile: path.resolve(args.config)
     });
@@ -308,23 +306,7 @@ const dev = defineCommand({
     await startDevServer(config);
   }
 });
-const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
-  public: true,
-  port: config.port,
-  logger,
-  qr: showQr,
-  https: config.https,
-  http2: config.http2,
-  ws: true
-});
 async function bundleFilesContext(config) {
-  const serverContent = `import app from './${OUT_APP_FILE}';
-
-export default app.h3App;`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    serverContent
-  );
   return await esbuild.context({
     ...config.esbuild,
     entryPoints: [
@@ -339,29 +321,67 @@ export default app.h3App;`;
     platform: config.esbuild.platform ?? "node"
   });
 }
+async function createDevServer(config) {
+  const h3 = await import('h3');
+  const app = h3.createApp();
+  const dynamicHandler = dynamicEventHandler(
+    () => "<div>initializing server...</div>"
+  );
+  app.use(dynamicHandler);
+  let ws;
+  const listener = await listen(toNodeListener(app), {
+    port: config.port,
+    https: config.https,
+    http2: config.http2,
+    public: true,
+    ws: {
+      resolve(info) {
+        if (ws?.resolve) {
+          return ws.resolve(info);
+        }
+        return {};
+      }
+    }
+  });
+  async function reload() {
+    const appEntry = (await import(path.resolve(
+      config.rootDir,
+      ".output",
+      `${OUT_APP_FILE}?version=${Date.now()}`
+    ))).default;
+    dynamicHandler.set(fromNodeMiddleware(appEntry.h3App.handler));
+    ws = appEntry.h3App.websocket;
+    return appEntry.getAppDefinition();
+  }
+  await reload();
+  return {
+    h3App: app,
+    listener,
+    reload,
+    ws
+  };
+}
 async function startDevServer(config) {
   await setupWorkingDir(config);
   const watcher = await import('chokidar');
   let fileWatcher;
-  await Promise.all([
-    createEntryModule(config),
-    createAppWithRoutesModule(config)
-  ]);
+  await createAppWithRoutesModule(config);
   const context = await bundleFilesContext(config);
   await context.rebuild();
-  const listener = await startListener(config, true);
-  setTimeout(async () => {
-    await generateClients(config);
-  }, 1e3);
+  const devServer = await createDevServer(config);
+  let appDef = await devServer.reload();
+  let appDefStr = JSON.stringify(appDef);
+  if (config.generators.length) {
+    logger.info(`Running generators...`);
+    await generateClientsFromDefinition(appDef, config);
+  } else {
+    logger.warn(`No generators specified in config. Skipping codegen.`);
+  }
   const cleanExit = async () => {
     process.exit();
   };
   process.on("exit", async () => {
-    await Promise.allSettled([
-      listener.close(),
-      fileWatcher?.close(),
-      context.dispose()
-    ]);
+    await Promise.allSettled([fileWatcher?.close(), context.dispose()]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);
@@ -404,65 +424,47 @@ async function startDevServer(config) {
         return;
       }
       await createAppWithRoutesModule(config);
-      let bundleCreated = false;
       try {
+        const reloadStart = (/* @__PURE__ */ new Date()).getTime();
         logger.log(
           "Change detected. Bundling files and restarting server...."
         );
         await context.rebuild();
-        bundleCreated = true;
+        const newAppDef = await devServer.reload();
+        const newAppDefStr = JSON.stringify(newAppDef);
+        logger.log(
+          `Server restarted in ${( new Date()).getTime() - reloadStart}ms`
+        );
+        if (config.generators.length && newAppDefStr !== appDefStr) {
+          logger.info(
+            `App Definition updated. Regenerating clients...`
+          );
+          await generateClientsFromDefinition(newAppDef, config);
+          appDef = newAppDef;
+          appDefStr = newAppDefStr;
+        }
       } catch (err) {
         logger.error("ERROR", err);
-        bundleCreated = false;
-      }
-      if (bundleCreated && config.generators.length) {
-        setTimeout(async () => {
-          await generateClients(config);
-          bundleCreated = false;
-        }, 1e3);
       }
     });
   }
   await load();
 }
-async function generateClients(config) {
+async function generateClientsFromDefinition(appDef, config) {
+  const startTime = (/* @__PURE__ */ new Date()).getTime();
   try {
-    const protocol = config.https === true || typeof config.https === "object" ? "https" : "http";
-    if (protocol === "https") {
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-    }
-    const result = await ofetch(
-      `${protocol}://127.0.0.1:${config.port}${DEV_DEFINITION_ENDPOINT}`
-    );
-    if (!isAppDefinition(result)) {
-      return;
-    }
-    logger.log(`Generating client code...`);
     const clientCount = config.generators.length;
     await Promise.allSettled(
       config.generators.map(
-        (generator) => generator.generator(result, true)
+        (generator) => generator.generator(appDef, true)
       )
     );
     logger.success(
-      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
+      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"} in ${( new Date()).getTime() - startTime}ms`
     );
   } catch (err) {
     logger.error(err);
   }
 }
-async function createEntryModule(config) {
-  const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path.relative(path.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualEntry = `import { toNodeListener } from '@arrirpc/server';
-import app from './${GEN_APP_FILE}';
-
-export default app.h3App;`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
-    virtualEntry
-  );
-}
 
 export { DEV_DEFINITION_ENDPOINT as D, GEN_APP_FILE as G, OUT_CODEGEN as O, isResolvedArriConfig as a, defineConfig as b, createAppWithRoutesModule as c, defaultConfig as d, OUT_SERVER_ENTRY as e, OUT_APP_FILE as f, getArriPackageMetadata as g, dev as h, isArriConfig as i, logger as l, setupWorkingDir as s };

package/dist/shared/{arri.42cdc72b.cjs → arri.976d7393.cjs}

@@ -1,17 +1,17 @@
 'use strict';
 
 const fs = require('node:fs');
-const fs$1 = require('node:fs/promises');
-const codegenUtils = require('@arrirpc/codegen-utils');
 const listhen = require('@joshmossas/listhen');
 const c12 = require('c12');
 const citty = require('citty');
 const esbuild = require('esbuild');
-require('h3');
-const ofetch = require('ofetch');
+const h3 = require('h3');
 const path = require('pathe');
+const fs$1 = require('node:fs/promises');
+const codegenUtils = require('@arrirpc/codegen-utils');
 const schema = require('@arrirpc/schema');
 const consola = require('consola');
+const ofetch = require('ofetch');
 const prettier = require('prettier');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -28,14 +28,13 @@ function _interopNamespaceCompat(e) {
     return n;
 }
 
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
 const logger = consola.createConsola().withTag("arri");
 const GEN_APP_FILE = "__arri_app.ts";
-const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
 const OUT_APP_FILE = "app.mjs";
 const OUT_SERVER_ENTRY = "server.mjs";
 const OUT_CODEGEN = "codegen.mjs";
@@ -311,7 +310,6 @@ const dev = citty.defineCommand({
     }
   },
   async run({ args }) {
-    process.env.ARRI_DEV_MODE = "true";
     const { config } = await c12.loadConfig({
       configFile: path__default.resolve(args.config)
     });
@@ -329,23 +327,7 @@ const dev = citty.defineCommand({
     await startDevServer(config);
   }
 });
-const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
-  public: true,
-  port: config.port,
-  logger,
-  qr: showQr,
-  https: config.https,
-  http2: config.http2,
-  ws: true
-});
 async function bundleFilesContext(config) {
-  const serverContent = `import app from './${OUT_APP_FILE}';
-
-export default app.h3App;`;
-  await fs__default.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    serverContent
-  );
   return await esbuild__namespace.context({
     ...config.esbuild,
     entryPoints: [
@@ -360,29 +342,67 @@ export default app.h3App;`;
     platform: config.esbuild.platform ?? "node"
   });
 }
+async function createDevServer(config) {
+  const h3$1 = await import('h3');
+  const app = h3$1.createApp();
+  const dynamicHandler = h3.dynamicEventHandler(
+    () => "<div>initializing server...</div>"
+  );
+  app.use(dynamicHandler);
+  let ws;
+  const listener = await listhen.listen(h3.toNodeListener(app), {
+    port: config.port,
+    https: config.https,
+    http2: config.http2,
+    public: true,
+    ws: {
+      resolve(info) {
+        if (ws?.resolve) {
+          return ws.resolve(info);
+        }
+        return {};
+      }
+    }
+  });
+  async function reload() {
+    const appEntry = (await import(path__default.resolve(
+      config.rootDir,
+      ".output",
+      `${OUT_APP_FILE}?version=${Date.now()}`
+    ))).default;
+    dynamicHandler.set(h3.fromNodeMiddleware(appEntry.h3App.handler));
+    ws = appEntry.h3App.websocket;
+    return appEntry.getAppDefinition();
+  }
+  await reload();
+  return {
+    h3App: app,
+    listener,
+    reload,
+    ws
+  };
+}
 async function startDevServer(config) {
   await setupWorkingDir(config);
   const watcher = await import('chokidar');
   let fileWatcher;
-  await Promise.all([
-    createEntryModule(config),
-    createAppWithRoutesModule(config)
-  ]);
+  await createAppWithRoutesModule(config);
   const context = await bundleFilesContext(config);
   await context.rebuild();
-  const listener = await startListener(config, true);
-  setTimeout(async () => {
-    await generateClients(config);
-  }, 1e3);
+  const devServer = await createDevServer(config);
+  let appDef = await devServer.reload();
+  let appDefStr = JSON.stringify(appDef);
+  if (config.generators.length) {
+    logger.info(`Running generators...`);
+    await generateClientsFromDefinition(appDef, config);
+  } else {
+    logger.warn(`No generators specified in config. Skipping codegen.`);
+  }
   const cleanExit = async () => {
     process.exit();
   };
   process.on("exit", async () => {
-    await Promise.allSettled([
-      listener.close(),
-      fileWatcher?.close(),
-      context.dispose()
-    ]);
+    await Promise.allSettled([fileWatcher?.close(), context.dispose()]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);
@@ -425,66 +445,48 @@ async function startDevServer(config) {
         return;
       }
       await createAppWithRoutesModule(config);
-      let bundleCreated = false;
       try {
+        const reloadStart = (/* @__PURE__ */ new Date()).getTime();
         logger.log(
           "Change detected. Bundling files and restarting server...."
         );
         await context.rebuild();
-        bundleCreated = true;
+        const newAppDef = await devServer.reload();
+        const newAppDefStr = JSON.stringify(newAppDef);
+        logger.log(
+          `Server restarted in ${( new Date()).getTime() - reloadStart}ms`
+        );
+        if (config.generators.length && newAppDefStr !== appDefStr) {
+          logger.info(
+            `App Definition updated. Regenerating clients...`
+          );
+          await generateClientsFromDefinition(newAppDef, config);
+          appDef = newAppDef;
+          appDefStr = newAppDefStr;
+        }
       } catch (err) {
         logger.error("ERROR", err);
-        bundleCreated = false;
-      }
-      if (bundleCreated && config.generators.length) {
-        setTimeout(async () => {
-          await generateClients(config);
-          bundleCreated = false;
-        }, 1e3);
       }
     });
   }
   await load();
 }
-async function generateClients(config) {
+async function generateClientsFromDefinition(appDef, config) {
+  const startTime = (/* @__PURE__ */ new Date()).getTime();
   try {
-    const protocol = config.https === true || typeof config.https === "object" ? "https" : "http";
-    if (protocol === "https") {
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-    }
-    const result = await ofetch.ofetch(
-      `${protocol}://127.0.0.1:${config.port}${DEV_DEFINITION_ENDPOINT}`
-    );
-    if (!codegenUtils.isAppDefinition(result)) {
-      return;
-    }
-    logger.log(`Generating client code...`);
     const clientCount = config.generators.length;
     await Promise.allSettled(
       config.generators.map(
-        (generator) => generator.generator(result, true)
+        (generator) => generator.generator(appDef, true)
       )
     );
     logger.success(
-      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
+      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"} in ${( new Date()).getTime() - startTime}ms`
     );
   } catch (err) {
     logger.error(err);
   }
 }
-async function createEntryModule(config) {
-  const appModule = path__default.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default.relative(path__default.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualEntry = `import { toNodeListener } from '@arrirpc/server';
-import app from './${GEN_APP_FILE}';
-
-export default app.h3App;`;
-  await fs__default.writeFile(
-    path__default.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
-    virtualEntry
-  );
-}
 
 exports.DEV_DEFINITION_ENDPOINT = DEV_DEFINITION_ENDPOINT;
 exports.GEN_APP_FILE = GEN_APP_FILE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.57.0",
+  "version": "0.57.3",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -39,12 +39,12 @@
     "ofetch": "^1.3.4",
     "pathe": "^1.1.2",
     "prettier": "^3.3.3",
-    "@arrirpc/codegen-dart": "0.57.0",
-    "@arrirpc/codegen-kotlin": "0.57.0",
-    "@arrirpc/codegen-rust": "0.57.0",
-    "@arrirpc/codegen-ts": "0.57.0",
-    "@arrirpc/codegen-utils": "0.57.0",
-    "@arrirpc/schema": "0.57.0"
+    "@arrirpc/codegen-dart": "0.57.3",
+    "@arrirpc/codegen-rust": "0.57.3",
+    "@arrirpc/codegen-kotlin": "0.57.3",
+    "@arrirpc/codegen-ts": "0.57.3",
+    "@arrirpc/schema": "0.57.3",
+    "@arrirpc/codegen-utils": "0.57.3"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6"