fscr 7.3.0 → 7.3.2

package/dist/lib/encryption/encryption.js

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import fcFilepicker from "fc-filepick";
 import inquirer from "inquirer";
+import fs from "fs";
 import {decrypt, encrypt} from "../utils/encryption.js";
 import {appendToFile, boxInform, ensureFile, readFile, readJson, writeFile} from "../utils/helpers.js";
 import path from "path";
@@ -43,7 +44,7 @@ encrypted.encrypt = async (pass = null, encryptedFile = null, decryptedFile = nu
         });
     }
     if (willEncrypt) {
-        let toEncrypt = await readFile(decryptedFile);
+        const toEncrypt = fs.readFileSync(decryptedFile);
         const ciphertext = encrypt(toEncrypt, pass);
         await writeFile(encryptedFile, ciphertext.toString());
     }
@@ -84,9 +85,9 @@ encrypted.decrypt = async (pass = null, encryptedFileLocation = null, decryptedF
         });
     }
     if (willEncrypt) {
-        let toDecrypt = await readFile(encryptedFileLocation);
+        const toDecrypt = fs.readFileSync(encryptedFileLocation, "utf8");
         const decryptedData = decrypt(toDecrypt, pass);
-        await writeFile(decryptedFileLocation, decryptedData);
+        fs.writeFileSync(decryptedFileLocation, decryptedData);
         console.warn(
             `${chalk.bold.green.underline("DECRYPTED FILE:")} ${chalk.bold.dim(path.join(scriptsDir, decryptedFileLocation))}`
         );

package/dist/lib/plugins/deployment/index.js

@@ -1,9 +1,6 @@
 import promptQuestion from "../../utils/prompt.js";
-import fcFilepicker1 from "fc-filepick";
 import { spawn } from "child_process";
 
-const fcFilepicker = fcFilepicker1.default;
-
 /**
  * Deploy
  * @param files
@@ -106,6 +103,8 @@ export default {
         context.logger.success("Deployment plugin initialized");
     },
     async run(ctx) {
+        const { default: fcFilepickerMod } = await import("fc-filepick");
+        const fcFilepicker = fcFilepickerMod.default ?? fcFilepickerMod;
         const r = await promptQuestion({}, "Subdomain?");
         const folder = await fcFilepicker({ type: "folder" });
         await deployExec(folder, r, ctx);

package/dist/lib/utils/encryption.js

@@ -23,10 +23,8 @@ const encrypt = (toEncrypt, password) => {
     const salt = crypto.randomBytes(8);
     const { key, iv } = deriveKeyIv(password, salt);
     const cipher = crypto.createCipheriv(algorithm, key, iv);
-    const ciphertext = Buffer.concat([
-        cipher.update(Buffer.from(toEncrypt, "utf8")),
-        cipher.final()
-    ]);
+    const input = Buffer.isBuffer(toEncrypt) ? toEncrypt : Buffer.from(toEncrypt, "utf8");
+    const ciphertext = Buffer.concat([cipher.update(input), cipher.final()]);
     return Buffer.concat([MAGIC, salt, ciphertext]).toString("base64");
 };
 
@@ -34,9 +32,10 @@ const decryptLegacy = (toDecrypt, password) => {
     const key = crypto.scryptSync(password, "salt", 24);
     const iv = Buffer.alloc(16, 0);
     const decipher = crypto.createDecipheriv("aes-192-cbc", key, iv);
-    let decrypted = decipher.update(String(toDecrypt).trim(), "hex", "utf8");
-    decrypted += decipher.final("utf8");
-    return decrypted;
+    return Buffer.concat([
+        decipher.update(Buffer.from(String(toDecrypt).trim(), "hex")),
+        decipher.final()
+    ]);
 };
 
 const decrypt = (toDecrypt, password) => {
@@ -51,7 +50,7 @@ const decrypt = (toDecrypt, password) => {
     const { key, iv } = deriveKeyIv(password, salt);
     const decipher = crypto.createDecipheriv(algorithm, key, iv);
     try {
-        return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
+        return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
     } catch (e) {
         throw new Error("Decryption failed — wrong password or corrupted file");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fscr",
-    "version": "7.3.0",
+    "version": "7.3.2",
     "description": "Runs the fscripts.md file",
     "type": "module",
     "main": "./dist/index.js",
@@ -25,9 +25,7 @@
         "encryptedFiles": [
             "config.json"
         ],
-        "ignore-upgrade": [
-            "micromatch"
-        ],
+        "ignore-upgrade": [],
         "config": "test.json"
     },
     "staticPath": {
@@ -46,65 +44,38 @@
         "fsr": "./bin"
     },
     "dependencies": {
-        "better-md-2-json": "^1.0.6",
         "boxen": "^8.0.1",
         "chalk": "^4.1.2",
         "conf": "^15.0.2",
         "cross-spawn": "^7.0.1",
         "detect-indent": "^7.0.2",
         "enquirer": "^2.3.4",
+        "fc-filepick": "^1.3.0",
         "fs-extra": "^11.3.2",
         "git-changed-files": "^1.0.0",
         "git-release-notes": "^5.0.0",
         "git-state": "^4.1.0",
-        "github-basic": "^6.0.0",
-        "ink": "^5.2.1",
-        "ink-select-input": "^4.2.2",
         "inquirer": "^12.9.6",
-        "is-builtin-module": "^5.0.0",
         "json-colorz": "^0.2.7",
         "markdown-toc": "^1.2.0",
         "marked": "^16.3.0",
-        "md-2-json": "^2.0.0",
-        "micromatch": "^4.0.2",
         "moment-mini": "^2.24.0",
         "open": "^10.2.0",
         "pretty-ms": "^9.3.0",
-        "react": "^18.3.1",
         "require-from-string": "^2.0.2",
         "server-destroy": "^1.0.1",
-        "set-value": "^4.1.0",
-        "shell-quote": "^1.7.2",
         "simple-git": "^3.28.0",
         "sort-object-keys": "^2.0.0",
         "staged-git-files": "^1.2.0",
-        "term-size": "^4.0.0"
+        "term-size": "^4.0.0",
+        "yargs": "^18.0.0"
     },
     "devDependencies": {
         "@vitest/coverage-v8": "^3.2.4",
-        "execa": "8.0.1",
-        "fancy-log": "^2.0.0",
-        "fc-filepick": "^1.3.0",
-        "fkill-cli": "^8.0.0",
-        "ink-tab": "^5.2.0",
-        "ink-table": "^3.1.0",
-        "lodash": "^4.17.15",
-        "markdown-it": "^14.1.0",
-        "mixin-deep": "^2.0.1",
-        "node-run-cmd": "^1.0.1",
         "nodemon": "^3.1.10",
         "npm-run-all": "^4.1.5",
-        "prepend-file": "^2.0.1",
-        "pretty-console-colors": "^2.0.0",
-        "pull-request": "^3.0.0",
-        "remarkable": "^2.0.0",
-        "rexrex": "^1.3.0",
         "rimraf": "^6.0.1",
-        "strip-ansi": "^7.1.2",
-        "terminal-tree": "^0.0.3",
-        "underscore.string": "^3.3.5",
-        "vitest": "^3.2.4",
-        "yargs": "^18.0.0"
+        "vitest": "^3.2.4"
     },
     "peerDependencies": {
         "chalk": "^4.1.2"