refactor

internal/api/_file.ts

@@ -1,7 +1,7 @@
 import mime from "mime";
 import { apiContext } from "utils/api-context";
 import { dir } from "utils/dir";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 import { readdir, stat } from "fs/promises";
 import { basename, dirname } from "path";
 import {

internal/api/_img.ts

@@ -2,7 +2,7 @@ import { dirAsync } from "fs-jetpack";
 import { apiContext } from "utils/api-context";
 import { stat } from "fs/promises";
 import { dir } from "utils/dir";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 import { dirname, parse } from "path";
 import sharp from "sharp";
 

internal/api/_kv.ts

@@ -1,7 +1,7 @@
 import { BunSqliteKeyValue } from "pkgs/utils/kv";
 import { apiContext } from "utils/api-context";
 import { dir } from "utils/dir";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 
 export const _ = {
   url: "/_kv",

internal/api/_notif.ts

@@ -4,7 +4,7 @@ import { listAsync } from "fs-jetpack";
 import { apiContext } from "utils/api-context";
 
 import { dir } from "utils/dir";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 
 export const _ = {
   url: "/_notif/:action/:token",

internal/api/_prasi.ts

@@ -1,5 +1,5 @@
 import { apiContext, createResponse } from "service-srv";
-import { SinglePage, prasi } from "../prasi";
+import { SinglePage, prasi } from "../prasi-var";
 import { gzipAsync } from "utils/gzip";
 import { getContent } from "../server/prep-api-ts";
 import mime from "mime";

internal/api/_upload.ts

@@ -3,7 +3,7 @@ import { dirAsync, existsAsync } from "fs-jetpack";
 import { format, parse, dirname } from "path";
 import { apiContext } from "utils/api-context";
 import { dir } from "utils/dir";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 
 export const _ = {
   url: "/_upload",

internal/api/_zip.ts

@@ -4,7 +4,7 @@ import { copyAsync } from "fs-jetpack";
 import mime from "mime";
 import { deploy } from "utils/deploy";
 import { dir } from "utils/dir";
-import { prasi, SinglePage } from "../prasi";
+import { prasi, SinglePage } from "../prasi-var";
 import { getContent } from "../server/prep-api-ts";
 
 export const _ = {

internal/init.ts

@@ -1,5 +0,0 @@
-import { prasi } from "./prasi";
-
-export const init = (opt: { root_dir: string; script_path: string }) => {
-  prasi.dir.root = opt.root_dir;
-};

internal/main/deploy/load.ts

@@ -4,7 +4,7 @@ import get from "lodash.get";
 import { decode } from "msgpackr";
 import { config } from "utils/config";
 import { fs } from "utils/fs";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 
 export const loadCurrentDeploy = async (ts: number) => {
   if (fs.exists(`site:deploy/current/${ts}.gz`)) {

internal/main/init.ts

@@ -0,0 +1,20 @@
+import { prasi } from "./prasi-var";
+
+export const init = async ({
+  root_dir,
+  script_path,
+  port,
+}: {
+  root_dir: string;
+  script_path: string;
+  port: number;
+}) => {
+  prasi.dir.root = root_dir;
+
+  delete require.cache[script_path];
+  prasi.server = require(script_path).server;
+
+  if (prasi.server?.init && port) {
+    await prasi.server.init({ port });
+  }
+};

internal/main/prasi-var.ts

@@ -1,5 +1,5 @@
 import type { PrasiServer } from "typings/server";
-import { type SiteConfig } from "./utils/config";
+import { type SiteConfig } from "utils/config";
 
 if (!(globalThis as any).prasi) {
   (globalThis as any).prasi = {};

internal/utils/config.ts

@@ -3,7 +3,7 @@ import get from "lodash.get";
 import set from "lodash.set";
 import { join } from "path";
 import { fs } from "./fs";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 
 export const initConfig = async (arg?: {
   is_ipc: boolean;

internal/utils/fs.ts

@@ -1,6 +1,6 @@
 import { mkdirSync, statSync } from "fs";
 import { copyAsync } from "fs-jetpack";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 import { dirname, join } from "path";
 import type { SiteConfig } from "./config";
 const internal = Symbol("internal");

internal/utils/static.ts

@@ -7,7 +7,7 @@ import { readFileSync } from "node:fs";
 import { join } from "path";
 import { addRoute, createRouter, findRoute } from "rou3";
 import type { ServerCtx } from "typings/server";
-import { prasi } from "../prasi";
+import { prasi } from "../prasi-var";
 import { waitUntil } from "./wait-until";
 
 await zstd.init();

package.json

@@ -2,10 +2,7 @@
   "name": "prasi-srv",
   "module": "index.ts",
   "type": "module",
-  "scripts": {
-    "dev": "bun run --watch --no-clear-screen internal/supervisor.ts --dev",
-    "server": "bun run internal/server.ts"
-  },
+  "scripts": {},
   "devDependencies": {
     "@types/bun": "latest"
   },

tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "paths": {
       "utils/*": ["./internal/utils/*"],
-      "typings/*": ["./internal/typings/*"]
+      "typings/*": ["./internal/typings/*"],
+      "main/*": ["./internal/main/*"]
     },
 
     // Enable latest features