gemi 0.4.78 → 0.4.80

package/dist/bin/index.js

@@ -7694,7 +7694,7 @@ var require_command = __commonJS((exports) => {
   };
   var EventEmitter = import.meta.require("events").EventEmitter;
   var childProcess = import.meta.require("child_process");
-  var path3 = import.meta.require("path");
+  var path2 = import.meta.require("path");
   var fs = import.meta.require("fs");
   var process2 = import.meta.require("process");
   var { Argument, humanReadableArgName } = require_argument();
@@ -8189,10 +8189,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
       let launchWithNode = false;
       const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
       function findFile(baseDir, baseName) {
-        const localBin = path3.resolve(baseDir, baseName);
+        const localBin = path2.resolve(baseDir, baseName);
         if (fs.existsSync(localBin))
           return localBin;
-        if (sourceExt.includes(path3.extname(baseName)))
+        if (sourceExt.includes(path2.extname(baseName)))
           return;
         const foundExt = sourceExt.find((ext) => fs.existsSync(`${localBin}${ext}`));
         if (foundExt)
@@ -8210,19 +8210,19 @@ Expecting one of '${allowedValues.join("', '")}'`);
         } catch (err) {
           resolvedScriptPath = this._scriptPath;
         }
-        executableDir = path3.resolve(path3.dirname(resolvedScriptPath), executableDir);
+        executableDir = path2.resolve(path2.dirname(resolvedScriptPath), executableDir);
       }
       if (executableDir) {
         let localFile = findFile(executableDir, executableFile);
         if (!localFile && !subcommand._executableFile && this._scriptPath) {
-          const legacyName = path3.basename(this._scriptPath, path3.extname(this._scriptPath));
+          const legacyName = path2.basename(this._scriptPath, path2.extname(this._scriptPath));
           if (legacyName !== this._name) {
             localFile = findFile(executableDir, `${legacyName}-${subcommand._name}`);
           }
         }
         executableFile = localFile || executableFile;
       }
-      launchWithNode = sourceExt.includes(path3.extname(executableFile));
+      launchWithNode = sourceExt.includes(path2.extname(executableFile));
       let proc;
       if (process2.platform !== "win32") {
         if (launchWithNode) {
@@ -8784,13 +8784,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
       return this;
     }
     nameFromFilename(filename) {
-      this._name = path3.basename(filename, path3.extname(filename));
+      this._name = path2.basename(filename, path2.extname(filename));
       return this;
     }
-    executableDir(path4) {
-      if (path4 === undefined)
+    executableDir(path3) {
+      if (path3 === undefined)
         return this._executableDir;
-      this._executableDir = path4;
+      this._executableDir = path3;
       return this;
     }
     helpInformation(contextOptions) {
@@ -8922,10 +8922,10 @@ var require_commander = __commonJS((exports) => {
 
 // bin/gemi.ts
 var {$ } = globalThis.Bun;
-import path3 from "path";
+import path2 from "path";
 
 // server/dev.ts
-import path from "path";
+import {join} from "path";
 
 // server/styles.tsx
 var jsx_dev_runtime = __toESM(require_jsx_dev_runtime(), 1);
@@ -9049,11 +9049,8 @@ async function startDevServer() {
   });
   process.env.ROOT_DIR = rootDir;
   process.env.APP_DIR = appDir;
-  async function requestHandler(req) {
+  async function handleDevRequests(req) {
     const { pathname } = new URL(req.url);
-    if (pathname.startsWith("/__gemi/image")) {
-      return await imageHandler(req);
-    }
     if (pathname.startsWith("/refresh.js")) {
       return new Response(`
           import RefreshRuntime from "http://localhost:5173/@react-refresh";
@@ -9075,77 +9072,109 @@ async function startDevServer() {
     } catch (err) {
       console.log(err);
     }
-    let app = null;
+  }
+  async function getApp() {
+    let app2;
     try {
-      app = (await vite.ssrLoadModule(path.join(appDir, "bootstrap.ts"))).app;
-    } catch (err) {
-      return new Response(renderErrorPage(err), {
-        status: 500,
-        headers: { "Content-Type": "text/html" }
+      app2 = (await vite.ssrLoadModule(join(appDir, "bootstrap.ts"))).app;
+      const { default: css } = await vite.ssrLoadModule(`${appDir}/app.css`);
+      const styles2 = [];
+      styles2.push({
+        isDev: true,
+        id: `${appDir}/app.css`,
+        content: css
       });
-    }
-    const { default: css } = await vite.ssrLoadModule(`${appDir}/app.css`);
-    const styles2 = [];
-    styles2.push({
-      isDev: true,
-      id: `${appDir}/app.css`,
-      content: css
-    });
-    app.setRenderParams({
-      styles: createStyles(styles2),
-      manifest: null,
-      serverManifest: null,
-      bootstrapModules: [
-        "/refresh.js",
-        "/app/client.tsx",
-        "http://localhost:5173/@vite/client"
-      ]
-    });
-    const handler = app.fetch.bind(app);
-    try {
-      return await handler(req);
-    } catch (err) {
-      console.log(err);
-      if (pathname.startsWith("/api")) {
-        return new Response(JSON.stringify({ error: err.message }), {
-          status: 500,
-          headers: { "Content-Type": "application/json" }
-        });
-      }
-      return new Response(renderErrorPage(err), {
-        headers: { "Content-Type": "text/html" }
+      app2.setRenderParams({
+        styles: createStyles(styles2),
+        manifest: null,
+        serverManifest: null,
+        bootstrapModules: [
+          "/refresh.js",
+          "/app/client.tsx",
+          "http://localhost:5173/@vite/client"
+        ]
       });
+      return app2;
+    } catch (err) {
+      console.log("Can't load bootstrap.ts");
+      console.error(err);
     }
   }
+  async function createServe(app2) {
+    const handler = app2.fetch.bind(app2);
+    return {
+      fetch: async (req, server2) => {
+        if (server2.upgrade(req, { data: { headers: req.headers } })) {
+          return;
+        }
+        if (!req.headers.get("x-forwarded-for")) {
+          const ip = server2.requestIP(req);
+          req.headers.set("x-forwarded-for", ip.address);
+        }
+        const { pathname } = new URL(req.url);
+        const devResponse = await handleDevRequests(req);
+        if (devResponse instanceof Response) {
+          return devResponse;
+        }
+        if (pathname.startsWith("/__gemi/image")) {
+          return await imageHandler(req);
+        }
+        try {
+          return await handler(req);
+        } catch (err) {
+          if (pathname.startsWith("/api")) {
+            return new Response(JSON.stringify({ error: err.message }), {
+              status: 500,
+              headers: { "Content-Type": "application/json" }
+            });
+          }
+          return new Response(renderErrorPage(err), {
+            headers: { "Content-Type": "text/html" }
+          });
+        }
+      },
+      port: process.env.PORT || 5173,
+      websocket: app2.websocket
+    };
+  }
   await vite.listen(5174);
-  const server = Bun.serve({
-    fetch: async (req, server2) => {
-      if (!req.headers.get("x-forwarded-for")) {
-        const ip = server2.requestIP(req);
-        req.headers.set("x-forwarded-for", ip.address);
-      }
-      return await requestHandler(req);
-    },
-    port: process.env.PORT || 5173
+  const app = await getApp();
+  const serve = await createServe(app);
+  const server = Bun.serve(serve);
+  app.onPublish((topic, data, compress) => {
+    server.publish(topic, data, compress);
   });
   console.log(`Server started on http://localhost:${process.env.PORT || 5173}`);
   vite.watcher.on("change", async (file) => {
-    if (file.includes("app/views")) {
+    const fileRelativePath = file.replace(rootDir, "");
+    if (fileRelativePath.startsWith("app/views")) {
+      console.log(`[vite] ${fileRelativePath} changed. \uD83C\uDF5C Hot reloading...`);
       return;
     }
-    console.log(`[vite] ${file} changed. Updating...`);
-    const mod = await vite.moduleGraph.getModuleByUrl(`/${file}`);
-    if (mod) {
-      console.log(`[vite] ${file} changed. Updating...`);
+    console.log(`[vite] ${fileRelativePath} changed. Reloading...`);
+    const modules = vite.moduleGraph.getModulesByFile(file);
+    for (const mod of Array.from(modules)) {
+      await vite.reloadModule(mod);
+    }
+    try {
+      const app2 = await getApp();
+      const serve2 = await createServe(app2);
+      app2.onPublish((topic, data, compress) => {
+        server.publish(topic, data, compress);
+      });
+      server.reload(serve2);
+    } catch (err) {
+      console.log("Error on server reload");
+      console.log(err);
     }
   });
   return server;
 }
 var rootDir = process.cwd();
-var appDir = path.join(rootDir, "app");
+var appDir = join(rootDir, "app");
 
 // server/prod.ts
-import {join} from "path";
+import {join as join2} from "path";
 
 // server/generateEtag.ts
 function generateETag(lastModified) {
@@ -10018,11 +10047,11 @@ async function startProdServer() {
   return server;
 }
 var rootDir2 = process.cwd();
-var appDir2 = join(rootDir2, "app");
-var distDir = join(rootDir2, "dist");
+var appDir2 = join2(rootDir2, "app");
+var distDir = join2(rootDir2, "dist");
 
 // bin/createRollupInput.ts
-import path2 from "path";
+import path from "path";
 
 // client/helpers/flattenComponentTree.ts
 function flattenComponentTree(componentTree) {
@@ -10035,7 +10064,7 @@ function flattenComponentTree(componentTree) {
 
 // bin/createRollupInput.ts
 async function createRollupInput_default() {
-  const { app } = await import(path2.resolve("./app/bootstrap.ts"));
+  const { app } = await import(path.resolve("./app/bootstrap.ts"));
   const entries = app.getComponentTree();
   function getEntries(componentTree) {
     const out = ["/app/client.tsx"];
@@ -10077,8 +10106,8 @@ program.command("dev").action(async () => {
 program.command("build").action(async () => {
   process.env.NODE_ENV = "production";
   const input = await createRollupInput_default();
-  const rootDir3 = path3.resolve(process.cwd());
-  const appDir3 = path3.join(rootDir3, "app");
+  const rootDir3 = path2.resolve(process.cwd());
+  const appDir3 = path2.join(rootDir3, "app");
   console.log("Building client...");
   await $`GEMI_INPUT=${JSON.stringify(input)} vite build --outDir dist/client`;
   console.log("Building server...");

package/dist/broadcasting/BroadcastingChannel.d.ts

@@ -0,0 +1,5 @@
+export declare class BroadcastingChannel {
+    subscribe(user: any): Promise<boolean>;
+    publish(input: any): any;
+}
+//# sourceMappingURL=BroadcastingChannel.d.ts.map

package/dist/broadcasting/BroadcastingChannel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BroadcastingChannel.d.ts","sourceRoot":"","sources":["../../broadcasting/BroadcastingChannel.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IACxB,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAI5C,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;CAGzB"}

package/dist/broadcasting/index.js

@@ -0,0 +1,2 @@
+// @bun
+import"../chunk-24a86f8f5ddc0cbd.js";class n{async subscribe(r){return!0}publish(r){return{}}}export{n as BroadcastingChannel};