From 1654e0f86786dc3bcdf81908738259d1f5863a7c Mon Sep 17 00:00:00 2001 From: Jason Jafari Date: Sat, 10 Oct 2026 22:18:04 -0400 Subject: [PATCH] wip --- bashUtils/ensureDependency.sh | 2 +- bun.lockb | Bin 272036 -> 277252 bytes cli/secrets.ts | 55 ++++++++++++++++++---------- helpers/jjEnsure.ts | 33 +++++++++++------ jj.sh | 66 ++++++++++++++++++++++++---------- package.json | 4 +-- 6 files changed, 110 insertions(+), 50 deletions(-) diff --git a/bashUtils/ensureDependency.sh b/bashUtils/ensureDependency.sh index 90bcd0c..48ea71c 100755 --- a/bashUtils/ensureDependency.sh +++ b/bashUtils/ensureDependency.sh @@ -25,7 +25,7 @@ if [[ -e $ASDF_DIR/asdf.sh ]]; then source $ASDF_DIR/asdf.sh fi - +# rm -rf $JJ_DATA_DIR/~~tmp/deps/asdf-tools-installed if ! hash asdf || \ [[ ! -e $JJ_DATA_DIR/~~tmp/deps/asdf-tools-installed ]] \ || jjIsFileNewerFile "$ASDF_DEFAULT_TOOL_VERSIONS_FILENAME" "$JJ_DATA_DIR/~~tmp/deps/asdf-tools-installed" ; then diff --git a/bun.lockb b/bun.lockb index 4cd211b290e2f34a2793247f7f9539be4c4dcef0..585753c8bc299aefaafd75432693c7c139e22cf7 100755 GIT binary patch delta 9247 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 Bb;1Au delta 8268 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 IZ*uJa0AFxRc>n+a diff --git a/cli/secrets.ts b/cli/secrets.ts index de73ef9..532b60d 100644 --- a/cli/secrets.ts +++ b/cli/secrets.ts @@ -9,25 +9,40 @@ import { saveFileIfItChanged } from "@jjHelpers/saveFileIfItChanged"; import * as YAML from "js-yaml"; import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@jjHelpers/gitSubRepoUtils"; import moment from "moment"; +import inquirer from "inquirer"; import { bashRunAndReturnSync } from "@jjHelpers/bashUtils"; const logger = makeJJlogger({ filename: "jj/cli/secrets.ts", }); -export const getSecretFolder = () => { - let secretsFolder = getJJConfigByKeyChain(`secretsFolder`); - secretsFolder = dynamicStringHandler(secretsFolder, "", process.env, false); - return secretsFolder; -}; +// export const getSecretFolder = () => { +// let secretsFolder = getJJConfigByKeyChain(`secretsFolder`); +// secretsFolder = dynamicStringHandler(secretsFolder, "", process.env, false); +// return secretsFolder; +// }; -export const getEncryptionKeyForEnv = (envKey) => { - const secretsFolder = getSecretFolder(); - if (!fs.existsSync(`${secretsFolder}/~~${envKey}`)) { - logger.error(`Encryption key for ${envKey} env not fond and nt exist `); - process.exit(1); +export const getEncryptionKeyForEnv = async (envKey) => { + // const secretsFolder = getSecretFolder(); + const secretsFolder = process.env['JJ_SECRET_TMP_DIR']; + if (!secretsFolder) { + throw new Error("JJ_SECRET_TMP_DIR is not set"); } - const encryptionKey = fs.readFileSync(`${secretsFolder}/~~${envKey}`, "utf8"); + const encryptionKeyPath = `${secretsFolder}/~~${envKey}`; + if (!fs.existsSync(encryptionKeyPath)) { + const { encryptionKey } = await inquirer.prompt([ + { + type: "password", + name: "encryptionKey", + message: `Enter encryption key for ${envKey}:`, + mask: "*", + validate: (value) => value.trim().length > 0 || "Encryption key cannot be empty", + }, + ]); + await fs.ensureDir(secretsFolder); + await fs.writeFile(encryptionKeyPath, encryptionKey, { encoding: "utf8", mode: 0o600, flag: "wx" }); + } + const encryptionKey = fs.readFileSync(encryptionKeyPath, "utf8"); return encryptionKey; }; @@ -56,7 +71,9 @@ export const decryptFile = async (absFilePath) => { } const absDirPath = path.dirname(absFilePath); const fileName = path.basename(absFilePath).replace(".json", ""); - const decryptFileJsonPath = `${absDirPath}/~~decrypt/${fileName}.json` + const envKey = path.basename(path.join(absFilePath, "..")); + const decryptDir = `${process.env['JJ_SECRET_TMP_DIR']}/${envKey}/~~decrypt` + const decryptFileJsonPath = `${decryptDir}/${fileName}.json` if (fs.existsSync(decryptFileJsonPath) ) { const isOlderThanOriginal = await isFileOlder(decryptFileJsonPath, absFilePath) if(isOlderThanOriginal) { @@ -70,10 +87,10 @@ export const decryptFile = async (absFilePath) => { const secretFileObjRaw = await fs.readFile(absFilePath, "utf8"); const secretObj = JSON.parse(secretFileObjRaw); - const envKey = path.basename(path.join(absFilePath, "..")); + const decryptedSecretObj = {}; - const encryptionKey = getEncryptionKeyForEnv(envKey); + const encryptionKey = await getEncryptionKeyForEnv(envKey); Object.keys(secretObj).forEach((key) => { const plainValue = secretObj[key]; if (plainValue.includes(`${envKey}--`)) { @@ -91,13 +108,13 @@ export const decryptFile = async (absFilePath) => { - if (!fs.existsSync(`${absDirPath}/~~decrypt`)) { - fs.mkdirSync(`${absDirPath}/~~decrypt`, { recursive: true }); + if (!fs.existsSync(`${decryptDir}`)) { + fs.mkdirSync(`${decryptDir}`, { recursive: true }); } - const decryptedJsonFormat = `${absDirPath}/~~decrypt/${fileName}.json`; + const decryptedJsonFormat = `${decryptDir}/${fileName}.json`; fs.writeFileSync(decryptedJsonFormat, JSON.stringify(decryptedSecretObj, null, 4), "utf-8"); - const decryptedShFormat = `${absDirPath}/~~decrypt/${fileName}.sh`; + const decryptedShFormat = `${decryptDir}/${fileName}.sh`; fs.writeFileSync(decryptedShFormat, shFormatDecrypt, "utf-8"); logger.success(`decrypt file-secret for ${absFilePath} done`); return decryptedSecretObj; @@ -124,7 +141,7 @@ export const setSecretFile = async ({ absFilePath, secretKey, secretValue }) => const envKey = path.basename(path.join(absFilePath, "..")); const secretFileObjRaw = await fs.readFile(absFilePath, "utf8"); const secretObj = JSON.parse(secretFileObjRaw); - const encryptionKey = getEncryptionKeyForEnv(envKey); + const encryptionKey = await getEncryptionKeyForEnv(envKey); const encryptVal = jjEncrypt(secretValue, encryptionKey); secretObj[secretKey.toUpperCase()] = `${envKey}--${encryptVal}`; diff --git a/helpers/jjEnsure.ts b/helpers/jjEnsure.ts index b8ba300..39dd14d 100755 --- a/helpers/jjEnsure.ts +++ b/helpers/jjEnsure.ts @@ -28,6 +28,11 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => { fs.mkdirSync(jjConfigs.JJ_TMP_DIR, { recursive: true }); } + if (!fs.existsSync(`${jjConfigs.JJ_TMP_DIR}/~~secrets`)) { + jjLog(`tmp folder ${`${jjConfigs.JJ_TMP_DIR}/~~secrets`} is not exist creating`); + fs.mkdirSync(`${jjConfigs.JJ_TMP_DIR}/~~secrets`, { recursive: true }); + } + if (!fs.existsSync(jjConfigs.workspacesFilePath)) { await fs.writeFile(jjConfigs.workspacesFilePath, JSON.stringify([], null, 4), "utf8"); } @@ -56,16 +61,22 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => { } if (!jjConfigs.jjYamlPath) { - console.log(chalk.magenta.bold(`please add it here in absolute path`)); - const answer: any = await inquirer.prompt([ - { - type: "input", - name: "jjYamlPath", - message: "", - }, - ]); - jjConfigs.jjYamlPath = answer.jjYamlPath; + if (process.env['JJ_WORKSPACE_DIR_TMP']) { + jjConfigs.jjYamlPath = `${process.env['JJ_WORKSPACE_DIR_TMP']}/jj.yaml`; + } else { + + console.log(chalk.magenta.bold(`please add it here in absolute path`)); + + const answer: any = await inquirer.prompt([ + { + type: "input", + name: "jjYamlPath", + message: "", + }, + ]); + jjConfigs.jjYamlPath = answer.jjYamlPath; + } } if (!fs.existsSync(jjConfigs.jjYamlPath)) { jjLogError(`can not find ${jjConfigs.jjYamlPath}`); @@ -104,6 +115,8 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => { jjConfigs.processEnvs.JJ_DATA_DIR = jjConfigs.JJ_DATA_DIR; jjConfigs.JJ_WORKSPACE_TMP_DIR = `${jjConfigs.JJ_WORKSPACE_DIR}/~~tmp`; jjConfigs.processEnvs.JJ_WORKSPACE_TMP_DIR = jjConfigs.JJ_WORKSPACE_TMP_DIR; + jjConfigs.JJ_SECRET_TMP_DIR = `${jjConfigs.JJ_TMP_DIR}/~~secrets`; + jjConfigs.processEnvs.JJ_SECRET_TMP_DIR = jjConfigs.JJ_SECRET_TMP_DIR; jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME = jjConfigs.jjYamlObj.name; jjConfigs.processEnvs.ASDF_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`; jjConfigs.processEnvs.ASDF_DATA_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`; @@ -113,7 +126,7 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => { .map((key) => `${key} ${jjConfigs.jjYamlObj.asdf.tools[key].version}`) .join("\n"); - saveFileIfItChanged(asdfToolsVersionFileContent, jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME); + saveFileIfItChanged(`${asdfToolsVersionFileContent}\n`, jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME); // export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME="$GC_HOME_DIR/.tool-versions" jjConfigs.processEnvs.ASDF_VERSION = jjConfigs.jjYamlObj.asdf.version; diff --git a/jj.sh b/jj.sh index daff676..4d127c2 100755 --- a/jj.sh +++ b/jj.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash - MILLISECONDS_START=$(echo "$EPOCHREALTIME * 1000" | bc) get_milliseconds() { @@ -21,11 +20,6 @@ trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT # export JJ_DATA_DIR="$HOME/.jjDataDir" -mkdir -p $JJ_DATA_DIR - -if [[ -e ~/.cargo/bin/rustup ]]; then - export PATH="~/.cargo/bin:${PATH}" -fi @@ -50,11 +44,38 @@ function findJJSource { export JJ_SOURCE_DIR=$(findJJSource) - - -if [[ -e ~/.bun/bin/bun ]]; then - export PATH="~/.bun/bin:${PATH}" +if ! JJ_DATA_DIR=$(bun -e ' + const fs = require("fs"); + const YAML = require(`${process.env.JJ_SOURCE_DIR}/node_modules/js-yaml`); + try { + const config = YAML.load(fs.readFileSync("jj.yaml", "utf8")); + if (typeof config?.dataFolder !== "string" || !config.dataFolder.trim()) { + throw new Error("jj.yaml must contain a non-empty dataFolder string"); + } + process.stdout.write(config.dataFolder); + } catch (error) { + console.error(`[jj] ${error.message}`); + process.exit(1); + } +'); then + exit 1 fi +if [[ "$JJ_DATA_DIR" == "~" ]]; then + JJ_DATA_DIR="$HOME" +elif [[ "$JJ_DATA_DIR" == "~/"* ]]; then + JJ_DATA_DIR="$HOME/${JJ_DATA_DIR:2}" +fi +export JJ_DATA_DIR + +mkdir -p "$JJ_DATA_DIR" + +if [[ -e "jj.yaml" ]];then + export JJ_WORKSPACE_DIR_TMP=$(pwd) +fi + + + + @@ -77,13 +98,13 @@ fi -__bunVersionExpect="1.3.9" -__currentBunVersion=$(bun --version || true) -if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then - rm -rf ~/.bun/bin/bun - curl -fsSL https://bun.sh/install | bash -s "bun-v$__bunVersionExpect" - export PATH="~/.bun/bin:${PATH}" -fi +# __bunVersionExpect="1.4.3" +# __currentBunVersion=$(bun --version || true) +# if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then +# rm -rf ~/.bun/bin/bun +# curl -fsSL https://bun.sh/install | bash -s "bun-v$__bunVersionExpect" +# export PATH="~/.bun/bin:${PATH}" +# fi mkdir -p "$JJ_DATA_DIR/~~tmp/deps" @@ -128,6 +149,10 @@ export JJ_WORKSPACE_CURRENT_BRANCH=$(cd $JJ_WORKSPACE_DIR ; git rev-parse --abbr export JJ_WORKSPACE_CURRENT_COMMIT_AUTHOR=$(cd $JJ_WORKSPACE_DIR ; git show -s --format='%an %ae' $JJ_WORKSPACE_CURRENT_COMMIT ) export JJ_WORKSPACE_CURRENT_VERSION=$(cat $JJ_WORKSPACE_DIR/package.json | jq -r '.version') export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") +if ! command -v python >/dev/null 2>&1; then + shopt -s expand_aliases + alias python=python3 +fi export JJ_PYTHON_VERSION=$(python --version | awk '{print $2}') @@ -146,6 +171,11 @@ cat << EOF > "$JJ_WORKSPACE_DIR/active.sh" #!/bin/bash if [[ -e "$ASDF_DIR/asdf.sh" ]]; then source "$ASDF_DIR/asdf.sh" + source "$JJ_DATA_DIR/~~tmp/shEnvs.sh" || true + export JJ_SOURCE_DIR="${JJ_SOURCE_DIR}" + export JJ_DATA_DIR="${JJ_DATA_DIR}" + export JJ_SECRET_TMP_DIR="${JJ_SECRET_TMP_DIR}" + source ${JJ_SOURCE_DIR}/bashUtils/auto-completion.sh fi EOF chmod +x "$JJ_WORKSPACE_DIR/active.sh" @@ -185,4 +215,4 @@ ${JJ_SOURCE_DIR}/helpers/jjCli.ts $@ -# $JJ_SOURCE_DIR/bin/run.ts $@ \ No newline at end of file +# $JJ_SOURCE_DIR/bin/run.ts $@ diff --git a/package.json b/package.json index 6c88e24..da8a935 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "jj-command-line", "description": "jj cli", - "version": "1.0.29", + "version": "2.1.1", "author": "Jason Jafari", "bin": { "jj": "./jj.sh" }, - "bugs": "https://github.com/https://github.com/jafarijason/jj/jj/issues", + "bugs": "https://gitea.root.sarava.dev/jason/jj-command-line/issues", "dependencies": { "chalk": "^5.3.0", "crypto-js": "^4.2.0",