arri 0.84.1 → 0.85.0

package/dist/index.cjs

@@ -439,34 +439,53 @@ const require = topLevelCreateRequire(import.meta.url);`
   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 = createServerEntryTemplate(config);
+  await fs__namespace.writeFile(
+    path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
+    virtualEntry
+  );
+}
+function createServerEntryTemplate(config) {
   let httpsString = ``;
   if (config.https === true) {
     httpsString = `https: true,`;
   } else if (typeof config.https === "object") {
     httpsString = `https: { cert: '${config.https.cert}', key: '${config.https.key}', passphrase: ${config.https.passphrase ? `'${config.https.passphrase}'` : "undefined"}},`;
   }
-  const virtualEntry = `import { toNodeListener } from '@arrirpc/server';
+  return `import { toNodeListener } from '@arrirpc/server';
 import { listen } from '@joshmossas/listhen';
 import app from './${OUT_APP_FILE}';
 
-void listen(toNodeListener(app.h3App), {
-    port: process.env.PORT ?? ${config.port},
-    public: true,
-    ws: {
-        resolve(info) {
-            if (app.h3App.websocket?.resolve) {
-                return app.h3App.websocket.resolve(info);
+async function startServer() {
+    const listener = await listen(toNodeListener(app.h3App), {
+        port: process.env.PORT ?? ${config.port},
+        public: true,
+        ws: {
+            resolve(info) {
+                if (app.h3App.websocket?.resolve) {
+                    return app.h3App.websocket.resolve(info);
+                }
+                return app.h3App.websocket?.hooks ?? app.h3App.handler?.__websocket__ ?? {};
             }
-            return app.h3App.websocket?.hooks ?? app.h3App.handler?.__websocket__ ?? {};
-        }
-    },
-    http2: ${config.http2 ?? false},
-    ${httpsString}
-});`;
-  await fs__namespace.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    virtualEntry
-  );
+        },
+        http2: ${config.http2 ?? false},
+        ${httpsString}
+    });
+    await app.start?.();
+
+    let isShuttingDown = false;
+    const handleShutdown = async () => {
+        if (isShuttingDown) return;
+        isShuttingDown = true;
+        await app.stop?.();
+        await listener.close();
+        process.exit(0);
+    };
+    process.on('SIGTERM', handleShutdown);
+    process.on('SIGINT', handleShutdown);
+}
+
+void startServer();`;
 }
 async function bundleFilesContext(config) {
   return await esbuild__default.context({
@@ -527,6 +546,7 @@ async function createDevServer(config) {
       `Serving unencrypted traffic from port ${secondaryListener.address.port}`
     );
   }
+  let currentApp;
   async function reload() {
     let importPath = path__default.resolve(
       config.rootDir,
@@ -536,18 +556,29 @@ async function createDevServer(config) {
     if (isOnWindows()) {
       importPath = createWindowsCompatibleImportPath(importPath);
     }
+    if (currentApp) {
+      await currentApp.stop?.();
+    }
     const appEntry = (await import(importPath)).default;
+    currentApp = appEntry;
     dynamicHandler.set(h3.fromNodeMiddleware(appEntry.h3App.handler));
     ws = appEntry.h3App.websocket;
+    await appEntry.start?.();
     return appEntry.getAppDefinition();
   }
-  await reload();
+  const initialAppDef = await reload();
   return {
     h3App: app,
     listener,
     secondaryListener,
     reload,
-    ws
+    ws,
+    close: async () => {
+      if (currentApp) {
+        await currentApp.stop?.();
+      }
+    },
+    currentAppDef: initialAppDef
   };
 }
 async function startDevServer(config, generators) {
@@ -558,7 +589,7 @@ async function startDevServer(config, generators) {
   const context = await bundleFilesContext(config);
   await context.rebuild();
   const devServer = await createDevServer(config);
-  let appDef = await devServer.reload();
+  let appDef = devServer.currentAppDef;
   let appDefStr = JSON.stringify(appDef);
   if (generators.length) {
     common.logger.info(`Running generators...`);
@@ -567,10 +598,15 @@ async function startDevServer(config, generators) {
     common.logger.warn(`No generators specified in config. Skipping codegen.`);
   }
   const cleanExit = async () => {
+    await devServer.close();
     process.exit();
   };
   process.on("exit", async () => {
-    await Promise.allSettled([fileWatcher?.close(), context.dispose()]);
+    await Promise.allSettled([
+      fileWatcher?.close(),
+      context.dispose(),
+      devServer.close()
+    ]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);

package/dist/index.mjs

@@ -412,34 +412,53 @@ const require = topLevelCreateRequire(import.meta.url);`
   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 = createServerEntryTemplate(config);
+  await fs.writeFile(
+    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
+    virtualEntry
+  );
+}
+function createServerEntryTemplate(config) {
   let httpsString = ``;
   if (config.https === true) {
     httpsString = `https: true,`;
   } else if (typeof config.https === "object") {
     httpsString = `https: { cert: '${config.https.cert}', key: '${config.https.key}', passphrase: ${config.https.passphrase ? `'${config.https.passphrase}'` : "undefined"}},`;
   }
-  const virtualEntry = `import { toNodeListener } from '@arrirpc/server';
+  return `import { toNodeListener } from '@arrirpc/server';
 import { listen } from '@joshmossas/listhen';
 import app from './${OUT_APP_FILE}';
 
-void listen(toNodeListener(app.h3App), {
-    port: process.env.PORT ?? ${config.port},
-    public: true,
-    ws: {
-        resolve(info) {
-            if (app.h3App.websocket?.resolve) {
-                return app.h3App.websocket.resolve(info);
+async function startServer() {
+    const listener = await listen(toNodeListener(app.h3App), {
+        port: process.env.PORT ?? ${config.port},
+        public: true,
+        ws: {
+            resolve(info) {
+                if (app.h3App.websocket?.resolve) {
+                    return app.h3App.websocket.resolve(info);
+                }
+                return app.h3App.websocket?.hooks ?? app.h3App.handler?.__websocket__ ?? {};
             }
-            return app.h3App.websocket?.hooks ?? app.h3App.handler?.__websocket__ ?? {};
-        }
-    },
-    http2: ${config.http2 ?? false},
-    ${httpsString}
-});`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    virtualEntry
-  );
+        },
+        http2: ${config.http2 ?? false},
+        ${httpsString}
+    });
+    await app.start?.();
+
+    let isShuttingDown = false;
+    const handleShutdown = async () => {
+        if (isShuttingDown) return;
+        isShuttingDown = true;
+        await app.stop?.();
+        await listener.close();
+        process.exit(0);
+    };
+    process.on('SIGTERM', handleShutdown);
+    process.on('SIGINT', handleShutdown);
+}
+
+void startServer();`;
 }
 async function bundleFilesContext(config) {
   return await esbuild.context({
@@ -500,6 +519,7 @@ async function createDevServer(config) {
       `Serving unencrypted traffic from port ${secondaryListener.address.port}`
     );
   }
+  let currentApp;
   async function reload() {
     let importPath = path.resolve(
       config.rootDir,
@@ -509,18 +529,29 @@ async function createDevServer(config) {
     if (isOnWindows()) {
       importPath = createWindowsCompatibleImportPath(importPath);
     }
+    if (currentApp) {
+      await currentApp.stop?.();
+    }
     const appEntry = (await import(importPath)).default;
+    currentApp = appEntry;
     dynamicHandler.set(fromNodeMiddleware(appEntry.h3App.handler));
     ws = appEntry.h3App.websocket;
+    await appEntry.start?.();
     return appEntry.getAppDefinition();
   }
-  await reload();
+  const initialAppDef = await reload();
   return {
     h3App: app,
     listener,
     secondaryListener,
     reload,
-    ws
+    ws,
+    close: async () => {
+      if (currentApp) {
+        await currentApp.stop?.();
+      }
+    },
+    currentAppDef: initialAppDef
   };
 }
 async function startDevServer(config, generators) {
@@ -531,7 +562,7 @@ async function startDevServer(config, generators) {
   const context = await bundleFilesContext(config);
   await context.rebuild();
   const devServer = await createDevServer(config);
-  let appDef = await devServer.reload();
+  let appDef = devServer.currentAppDef;
   let appDefStr = JSON.stringify(appDef);
   if (generators.length) {
     logger.info(`Running generators...`);
@@ -540,10 +571,15 @@ async function startDevServer(config, generators) {
     logger.warn(`No generators specified in config. Skipping codegen.`);
   }
   const cleanExit = async () => {
+    await devServer.close();
     process.exit();
   };
   process.on("exit", async () => {
-    await Promise.allSettled([fileWatcher?.close(), context.dispose()]);
+    await Promise.allSettled([
+      fileWatcher?.close(),
+      context.dispose(),
+      devServer.close()
+    ]);
   });
   process.on("SIGINT", cleanExit);
   process.on("SIGTERM", cleanExit);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.84.1",
+  "version": "0.85.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -39,13 +39,13 @@
     "ofetch": "^1.5.1",
     "pathe": "^2.0.3",
     "prettier": "^3.8.1",
-    "@arrirpc/codegen-dart": "0.84.1",
-    "@arrirpc/codegen-rust": "0.84.1",
-    "@arrirpc/codegen-kotlin": "0.84.1",
-    "@arrirpc/codegen-ts": "0.84.1",
-    "@arrirpc/codegen-swift": "0.84.1",
-    "@arrirpc/codegen-utils": "0.84.1",
-    "@arrirpc/schema": "0.84.1"
+    "@arrirpc/codegen-dart": "0.85.0",
+    "@arrirpc/codegen-rust": "0.85.0",
+    "@arrirpc/codegen-swift": "0.85.0",
+    "@arrirpc/codegen-kotlin": "0.85.0",
+    "@arrirpc/codegen-ts": "0.85.0",
+    "@arrirpc/codegen-utils": "0.85.0",
+    "@arrirpc/schema": "0.85.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6"