natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Removed references to the built client
ci/woodpecker/tag/ociImageTag Pipeline is pending Details

This commit is contained in:
Natty 2023-07-08 12:42:45 +02:00
parent d97d4a839f
commit 30cacef984
Signed by: natty
GPG Key ID: BF6CB659ADEE60EC
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/backend/src/boot/master.ts
View File

@ -1,6 +1,6 @@
import * as fs from "node:fs"; import * as fs from "node:fs";
import { fileURLToPath } from "node:url"; import {fileURLToPath} from "node:url";
import { dirname } from "node:path"; import {dirname} from "node:path";
import * as os from "node:os"; import * as os from "node:os";
import cluster from "node:cluster"; import cluster from "node:cluster";
import chalk from "chalk"; import chalk from "chalk";
@ -9,28 +9,26 @@ import semver from "semver";
import Logger from "@/services/logger.js"; import Logger from "@/services/logger.js";
import loadConfig from "@/config/load.js"; import loadConfig from "@/config/load.js";
import type { Config } from "@/config/types.js"; import type {Config} from "@/config/types.js";
import { lessThan } from "@/prelude/array.js"; import {envOption} from "../env.js";
import { envOption } from "../env.js"; import {showMachineInfo} from "@/misc/show-machine-info.js";
import { showMachineInfo } from "@/misc/show-machine-info.js"; import {db, initDb} from "../db/postgre.js";
import { db, initDb } from "../db/postgre.js";
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename); const _dirname = dirname(_filename);
const meta = JSON.parse(
fs.readFileSync(`${_dirname}/../../../../built/meta.json`, "utf-8"),
);
const logger = new Logger("core", "cyan"); const logger = new Logger("core", "cyan");
const bootLogger = logger.createSubLogger("boot", "magenta", false); const bootLogger = logger.createSubLogger("boot", "magenta", false);
const themeColor = chalk.hex("#31748f"); const themeColor = chalk.hex("#31748f");
function greet() { function greet() {
const meta = JSON.parse(
fs.readFileSync(`${_dirname}/../../../../package.json`, "utf-8"),
);
if (!envOption.quiet) { if (!envOption.quiet) {
//#region Calckey logo //#region Calckey logo
const v = `v${meta.version}`;
console.log(themeColor(" ___ _ _ ")); console.log(themeColor(" ___ _ _ "));
console.log(themeColor(" / __\\__ _| | ___| | _____ _ _ ")); console.log(themeColor(" / __\\__ _| | ___| | _____ _ _ "));
console.log(themeColor(" / / / _` | |/ __| |/ / _ | | |")); console.log(themeColor(" / / / _` | |/ __| |/ / _ | | |"));

16
packages/backend/src/config/load.ts
View File

@ -3,10 +3,10 @@
*/ */
import * as fs from "node:fs"; import * as fs from "node:fs";
import { fileURLToPath } from "node:url"; import {fileURLToPath} from "node:url";
import { dirname } from "node:path"; import {dirname} from "node:path";
import * as yaml from "js-yaml"; import * as yaml from "js-yaml";
import type { Source, Mixin } from "./types.js"; import type {Mixin, Source} from "./types.js";
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename); const _dirname = dirname(_filename);
@ -24,14 +24,9 @@ const path =
export default function load() { export default function load() {
const meta = JSON.parse( const meta = JSON.parse(
fs.readFileSync(`${_dirname}/../../../../built/meta.json`, "utf-8"), fs.readFileSync(`${_dirname}/../../../../package.json`, "utf-8"),
);
const clientManifest = JSON.parse(
fs.readFileSync(
`${_dirname}/../../../../built/_client_dist_/manifest.json`,
"utf-8",
),
); );
const config = yaml.load(fs.readFileSync(path, "utf-8")) as Source; const config = yaml.load(fs.readFileSync(path, "utf-8")) as Source;
const mixin = {} as Mixin; const mixin = {} as Mixin;
@ -52,7 +47,6 @@ export default function load() {
mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`; mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`; mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
mixin.userAgent = `Calckey/${meta.version} (${config.url})`; mixin.userAgent = `Calckey/${meta.version} (${config.url})`;
mixin.clientEntry = clientManifest["src/init.ts"];
if (!config.redis.prefix) config.redis.prefix = mixin.host; if (!config.redis.prefix) config.redis.prefix = mixin.host;

1
packages/backend/src/config/types.ts
View File

@ -145,7 +145,6 @@ export type Mixin = {
authUrl: string; authUrl: string;
driveUrl: string; driveUrl: string;
userAgent: string; userAgent: string;
clientEntry: string;
}; };
export type Config = Source & Mixin; export type Config = Source & Mixin;