wip fix

Dockerfile

@@ -9,6 +9,8 @@ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get update
 RUN apt-get install nodejs -yq
 
+RUN PATH="/usr/lib/node_modules/npm/bin:$PATH"
+
 COPY dockerzip .
 RUN unzip -o dockerzip
 RUN bun install

pkgs/docker-prep.ts

@@ -1,16 +1,17 @@
 import { $ } from "execa";
 import fs from "fs";
-import {
-  copyAsync,
-  dirAsync,
-  existsAsync,
-  removeAsync
-} from "fs-jetpack";
+import { copyAsync, dirAsync, existsAsync, removeAsync } from "fs-jetpack";
 import path from "path";
 
+const g = global as any;
+if (!g.dockerPrepared) {
+  g.dockerPrepared = true;
   const dir = {
     path(...allpath: any[]) {
-    return path.join(process.cwd(), ...allpath);
+      return path.join(
+        process.cwd(),
+        ...allpath.map((e) => (Array.isArray(e) ? e.join("") : e))
+      );
     },
     read(dirPath: string, baseDir?: string[]): Record<string, string> {
       const result: Record<string, string> = {};
@@ -38,6 +39,11 @@ const dir = {
 
   if (!(await existsAsync(dir.path("_tmp_docker")))) {
     for (const file of Object.keys(dir.read(dir.path``))) {
+      if (
+        file.startsWith("app/") ||
+        file.startsWith("pkgs/") ||
+        ["bun.lockb", "package.json"].includes(file)
+      ) {
         if (file.endsWith("package.json")) {
           await dirAsync(dir.path("_tmp_docker", path.dirname(file)));
           await copyAsync(dir.path(file), dir.path("_tmp_docker", file), {
@@ -45,9 +51,10 @@ if (!(await existsAsync(dir.path("_tmp_docker")))) {
           });
         }
       }
-  await copyAsync(dir.path("bun.lockb"), dir.path("_tmp_docker", "bun.lockb"));
+    }
 
     await $({ cwd: dir.path("_tmp_docker") })`zip -r ../docker .`;
     await $`mv docker.zip dockerzip`;
     await removeAsync(dir.path("_tmp_docker"));
   }
+}

pkgs/server/create.ts

@@ -59,12 +59,6 @@ export const createServer = async () => {
   await scan(dir(`app/srv/api`));
   await scan(dir(`pkgs/api`));
 
-  g.createServer = (arg) => {
-    return async (site_id: string) => {
-      return arg;
-    };
-  };
-
   g.server = Bun.serve({
     port: g.port,
     maxRequestBodySize: 1024 * 1024 * 128,
@@ -131,14 +125,10 @@ export const createServer = async () => {
           (await existsAsync(dir(`app/web/server/index.js`)))
         ) {
           const res = require(dir(`app/web/server/index.js`));
-          if (res && res.server) {
-            if (typeof res.server === "function") {
-              g.deploy.server = await res.server();
-            } else {
+          if (res && typeof res.server === 'object') {
             g.deploy.server = res.server;
           }
         }
-        }
         if (g.deploy.server && g.deploy.index) {
           try {
             return await g.deploy.server.http({

pkgs/server/serve-web.ts

@@ -1,7 +1,5 @@
 import mime from "mime";
 
-
-
 export const serveWeb = async (arg: { pathname: string; content: string }) => {
   const type = mime.getType(arg.pathname);
 

pkgs/utils/global.ts

@@ -70,9 +70,6 @@ export const g = global as unknown as {
     br: Record<string, Uint8Array>;
     br_timeout: Set<string>;
   };
-  createServer: (
-    arg: PrasiServer & { api: any; db: any }
-  ) => (site_id: string) => Promise<PrasiServer & { api: any; db: any }>;
   deploy: {
     init: boolean;
     raw: any;