keycloakify 11.15.4 → 11.15.6

package/bin/97.index.js

@@ -1146,7 +1146,8 @@ async function npmInstall(params) {
 async function runPackageManagerInstall(params) {
     const { packageManagerBinName, cwd } = params;
     const dCompleted = new Deferred.Deferred();
-    const child = external_child_process_.spawn(packageManagerBinName, ["install", ...(packageManagerBinName !== "npm" ? [] : ["--force"])], {
+    const packageManagerArguments = ["install", ...(packageManagerBinName !== "npm" ? [] : ["--force"])];
+    const child = external_child_process_.spawn(packageManagerBinName + " " + packageManagerArguments.join(" "), {
         cwd,
         env: process.env,
         shell: true

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.15.4",
+    "version": "11.15.6",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",
@@ -1230,7 +1230,7 @@
         "@types/properties-parser": "^0.3.3",
         "@types/react": "^18.0.35",
         "@types/react-dom": "^18.0.11",
-        "@types/yauzl": "^2.10.3",
+        "@types/yauzl": "^3.3.0",
         "@vercel/ncc": "^0.38.1",
         "babel-loader": "9.1.3",
         "chalk": "^4.1.2",
@@ -1243,6 +1243,7 @@
         "html-entities": "^2.5.2",
         "husky": "^4.3.8",
         "isomorphic-dompurify": "^2.15.0",
+        "json5": "^2.2.3",
         "lint-staged": "^11.0.0",
         "magic-string": "^0.30.7",
         "make-fetch-happen": "^11.0.3",
@@ -1263,8 +1264,7 @@
         "vitest": "^1.6.0",
         "webpack": "5.93.0",
         "webpack-cli": "5.1.4",
-        "yauzl": "^2.10.0",
-        "zod": "^3.17.10",
-        "json5": "^2.2.3"
+        "yauzl": "^3.4.0",
+        "zod": "^3.17.10"
     }
 }

package/src/bin/start-keycloak/appBuild.ts

@@ -152,7 +152,7 @@ export async function appBuild(params: {
 
         console.log(chalk.blue("$ npx vite build"));
 
-        const child = child_process.spawn("npx", ["vite", "build"], {
+        const child = child_process.spawn("npx vite build", {
             cwd: buildContext.projectDirPath,
             shell: true
         });

package/src/bin/start-keycloak/keycloakifyBuild.ts

@@ -22,7 +22,7 @@ export async function keycloakifyBuild(params: {
 
     console.log(chalk.blue("$ npx keycloakify build"));
 
-    const child = child_process.spawn("npx", ["keycloakify", "build"], {
+    const child = child_process.spawn("npx keycloakify build", {
         cwd: buildContext.projectDirPath,
         env: {
             ...process.env,

package/src/bin/start-keycloak/realmConfig/dumpContainerConfig.ts

@@ -52,27 +52,24 @@ export async function dumpContainerConfig(params: {
 
     {
         const dCompleted = new Deferred<void>();
-
-        const child = child_process.spawn(
-            "docker",
-            [
-                ...["exec", CONTAINER_NAME],
-                ...["/opt/keycloak/bin/kc.sh", "export"],
-                ...["--dir", "/tmp"],
-                ...["--realm", realmName],
-                ...["--users", "realm_file"],
-                ...(!doesUseLockedH2Database
-                    ? []
-                    : [
-                          ...["--db", "dev-file"],
-                          ...[
-                              "--db-url",
-                              '"jdbc:h2:file:/tmp/h2/keycloakdb;NON_KEYWORDS=VALUE"'
-                          ]
-                      ])
-            ],
-            { shell: true }
-        );
+        const dockerArguments = [
+            ...["exec", CONTAINER_NAME],
+            ...["/opt/keycloak/bin/kc.sh", "export"],
+            ...["--dir", "/tmp"],
+            ...["--realm", realmName],
+            ...["--users", "realm_file"],
+            ...(!doesUseLockedH2Database
+                ? []
+                : [
+                        ...["--db", "dev-file"],
+                        ...[
+                            "--db-url",
+                            '"jdbc:h2:file:/tmp/h2/keycloakdb;NON_KEYWORDS=VALUE"'
+                        ]
+                    ])
+        ];
+
+        const child = child_process.spawn("docker " + dockerArguments.join(" "), { shell: true });
 
         let output = "";
 

package/src/bin/start-keycloak/start-keycloak.ts

@@ -621,8 +621,8 @@ export async function command(params: {
     );
 
     const child = child_process.spawn(
-        "docker",
-        ["run", ...dockerRunArgs.map(line => line.split(SPACE_PLACEHOLDER)).flat()],
+        "docker run " +
+        dockerRunArgs.map(line => line.split(SPACE_PLACEHOLDER)).flat().join(" "),
         { shell: true }
     );
 

package/src/bin/start-keycloak/startViteDevServer.ts

@@ -18,7 +18,7 @@ export function startViteDevServer(params: {
 
     console.log(chalk.blue(`$ npx vite dev`));
 
-    const child = child_process.spawn("npx", ["vite", "dev"], {
+    const child = child_process.spawn("npx vite dev", {
         cwd: buildContext.projectDirPath,
         env: {
             ...process.env,

package/src/bin/tools/extractArchive.ts

@@ -2,10 +2,21 @@ import fs from "fs/promises";
 import fsSync from "fs";
 import yauzl from "yauzl";
 import stream from "stream";
-import { Deferred } from "evt/tools/Deferred";
 import { dirname as pathDirname, sep as pathSep } from "path";
 import { existsAsync } from "./fs.existsAsync";
 
+type ZipFileWithPromises = yauzl.ZipFile & {
+    eachEntry: () => AsyncIterable<yauzl.Entry>;
+    openReadStreamPromise: (
+        entry: yauzl.Entry,
+        options?: yauzl.ZipFileOptions
+    ) => Promise<stream.Readable>;
+};
+
+type YauzlWithPromises = typeof yauzl & {
+    openPromise: (path: string, options?: yauzl.Options) => Promise<ZipFileWithPromises>;
+};
+
 export async function extractArchive(params: {
     archiveFilePath: string;
     onArchiveFile: (params: {
@@ -18,22 +29,7 @@ export async function extractArchive(params: {
 }) {
     const { archiveFilePath, onArchiveFile } = params;
 
-    const zipFile = await new Promise<yauzl.ZipFile>((resolve, reject) => {
-        yauzl.open(archiveFilePath, { lazyEntries: true }, async (error, zipFile) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve(zipFile);
-        });
-    });
-
-    const dDone = new Deferred<void>();
-
-    zipFile.once("end", () => {
-        zipFile.close();
-        dDone.resolve();
-    });
+    const zipFile = await (yauzl as YauzlWithPromises).openPromise(archiveFilePath);
 
     const writeFile = async (
         entry: yauzl.Entry,
@@ -57,56 +53,39 @@ export async function extractArchive(params: {
             return;
         }
 
-        const readStream = await new Promise<stream.Readable>(resolve =>
-            zipFile.openReadStream(entry, async (error, readStream) => {
+        const readStream = await zipFile.openReadStreamPromise(entry);
+
+        await new Promise<void>((resolve, reject) => {
+            stream.pipeline(readStream, fsSync.createWriteStream(filePath), error => {
                 if (error) {
-                    dDone.reject(error);
+                    reject(error);
                     return;
                 }
 
-                resolve(readStream);
-            })
-        );
-
-        const dDoneWithFile = new Deferred<void>();
-
-        stream.pipeline(readStream, fsSync.createWriteStream(filePath), error => {
-            if (error) {
-                dDone.reject(error);
-                return;
-            }
-
-            dDoneWithFile.resolve();
+                resolve();
+            });
         });
-
-        await dDoneWithFile.pr;
     };
 
-    const readFile = (entry: yauzl.Entry) =>
-        new Promise<Buffer>(resolve =>
-            zipFile.openReadStream(entry, async (error, readStream) => {
-                if (error) {
-                    dDone.reject(error);
-                    return;
-                }
+    const readFile = async (entry: yauzl.Entry) => {
+        const readStream = await zipFile.openReadStreamPromise(entry);
 
-                const chunks: Buffer[] = [];
+        return new Promise<Buffer>((resolve, reject) => {
+            const chunks: Buffer[] = [];
 
-                readStream.on("data", chunk => {
-                    chunks.push(chunk);
-                });
+            readStream.on("data", chunk => {
+                chunks.push(chunk);
+            });
 
-                readStream.on("end", () => {
-                    resolve(Buffer.concat(chunks));
-                });
+            readStream.on("end", () => {
+                resolve(Buffer.concat(chunks));
+            });
 
-                readStream.on("error", error => {
-                    dDone.reject(error);
-                });
-            })
-        );
+            readStream.on("error", reject);
+        });
+    };
 
-    zipFile.on("entry", async (entry: yauzl.Entry) => {
+    for await (const entry of zipFile.eachEntry()) {
         handle_file: {
             // NOTE: Skip directories
             if (entry.fileName.endsWith("/")) {
@@ -126,15 +105,8 @@ export async function extractArchive(params: {
 
             if (hasEarlyExitBeenCalled) {
                 zipFile.close();
-                dDone.resolve();
                 return;
             }
         }
-
-        zipFile.readEntry();
-    });
-
-    zipFile.readEntry();
-
-    await dDone.pr;
+    }
 }

package/src/bin/tools/npmInstall.ts

@@ -98,10 +98,10 @@ async function runPackageManagerInstall(params: {
     const { packageManagerBinName, cwd } = params;
 
     const dCompleted = new Deferred<void>();
+    const packageManagerArguments = ["install", ...(packageManagerBinName !== "npm" ? [] : ["--force"])];
 
     const child = child_process.spawn(
-        packageManagerBinName,
-        ["install", ...(packageManagerBinName !== "npm" ? [] : ["--force"])],
+        packageManagerBinName + " " + packageManagerArguments.join(" "),
         {
             cwd,
             env: process.env,