midsuit
/
prasi-bun
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip fix

This commit is contained in:
Rizky 2024-02-07 19:15:02 +07:00
parent e1c849d3ec
commit 1de319400d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/core/index.ts
View File

@ -13,7 +13,6 @@ import { createId } from "@paralleldrive/cuid2";
import { prepareApiRoutes } from "./server/api/api-scan"; import { prepareApiRoutes } from "./server/api/api-scan";
import { writeAsync } from "fs-jetpack"; import { writeAsync } from "fs-jetpack";
import { dir } from "dir"; import { dir } from "dir";
import { join } from "path";
import { watchApiRoutes } from "./server/api/api-watch"; import { watchApiRoutes } from "./server/api/api-watch";
// import "../docker-prep"; // import "../docker-prep";
@ -31,13 +30,8 @@ if (!g.Y) {
await createLogger(); await createLogger();
g._api = {}; g._api = {};
g.mode = process.argv.includes("dev") ? "dev" : "prod"; g.mode = process.argv.includes("dev") ? "dev" : "prod";
Object.defineProperty(g, "datadir", { g.datadir = dir.path(g.mode === "prod" ? "../data" : "data", false);
get: function () {
return join(process.cwd(), g.mode === "prod" ? "../data" : "data");
},
});
console.log("DataDir", g.datadir); console.log("DataDir", g.datadir);
g.port = parseInt(process.env.PORT || "4550"); g.port = parseInt(process.env.PORT || "4550");
g.log.info(g.mode === "dev" ? "DEVELOPMENT" : "PRODUCTION"); g.log.info(g.mode === "dev" ? "DEVELOPMENT" : "PRODUCTION");

5
pkgs/core/utils/dir.ts
View File

@ -3,6 +3,11 @@ import { join } from "path";
export const dir = { export const dir = {
path: (path: string, safe?: boolean) => { path: (path: string, safe?: boolean) => {
if (safe === false) return join(process.cwd(), path); if (safe === false) return join(process.cwd(), path);
if (path.startsWith(process.cwd())) {
return path;
}
const final_path = path const final_path = path
.split("/") .split("/")
.filter((e) => e !== "..") .filter((e) => e !== "..")