keycloakify 11.15.4 → 11.15.6

package/README.md

@@ -147,6 +147,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LennartMart"><img src="https://avatars.githubusercontent.com/u/1591933?v=4?s=100" width="100px;" alt="LennartMart"/><br /><sub><b>LennartMart</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=LennartMart" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://federicobartoli.it/"><img src="https://avatars.githubusercontent.com/u/27234034?v=4?s=100" width="100px;" alt="Federico Bartoli"/><br /><sub><b>Federico Bartoli</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=federicobartoli" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.oussemasahbeni.com"><img src="https://avatars.githubusercontent.com/u/104161749?v=4?s=100" width="100px;" alt="Oussema Sahbeni"/><br /><sub><b>Oussema Sahbeni</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=Oussemasahbeni" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/githrdw"><img src="https://avatars.githubusercontent.com/u/1455140?v=4?s=100" width="100px;" alt="githrdw"/><br /><sub><b>githrdw</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=githrdw" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package/bin/375.index.js

@@ -54,12 +54,16 @@ var yauzl = __webpack_require__(78781);
 // EXTERNAL MODULE: external "stream"
 var external_stream_ = __webpack_require__(12781);
 var external_stream_default = /*#__PURE__*/__webpack_require__.n(external_stream_);
-// EXTERNAL MODULE: ./node_modules/evt/tools/Deferred.js
-var Deferred = __webpack_require__(50689);
 // EXTERNAL MODULE: ./dist/bin/tools/fs.existsAsync.js
 var fs_existsAsync = __webpack_require__(43765);
 ;// CONCATENATED MODULE: ./dist/bin/tools/extractArchive.js
-
+var __asyncValues = (undefined && undefined.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 
 
 
@@ -67,21 +71,9 @@ var fs_existsAsync = __webpack_require__(43765);
 
 
 async function extractArchive(params) {
+    var _a, e_1, _b, _c;
     const { archiveFilePath, onArchiveFile } = params;
-    const zipFile = await new Promise((resolve, reject) => {
-        yauzl.open(archiveFilePath, { lazyEntries: true }, async (error, zipFile) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve(zipFile);
-        });
-    });
-    const dDone = new Deferred.Deferred();
-    zipFile.once("end", () => {
-        zipFile.close();
-        dDone.resolve();
-    });
+    const zipFile = await yauzl.openPromise(archiveFilePath);
     const writeFile = async (entry, params) => {
         const { filePath, modifiedData } = params;
         {
@@ -94,66 +86,72 @@ async function extractArchive(params) {
             await promises_default().writeFile(filePath, modifiedData);
             return;
         }
-        const readStream = await new Promise(resolve => zipFile.openReadStream(entry, async (error, readStream) => {
-            if (error) {
-                dDone.reject(error);
-                return;
-            }
-            resolve(readStream);
-        }));
-        const dDoneWithFile = new Deferred.Deferred();
-        external_stream_default().pipeline(readStream, external_fs_default().createWriteStream(filePath), error => {
-            if (error) {
-                dDone.reject(error);
-                return;
-            }
-            dDoneWithFile.resolve();
+        const readStream = await zipFile.openReadStreamPromise(entry);
+        await new Promise((resolve, reject) => {
+            external_stream_default().pipeline(readStream, external_fs_default().createWriteStream(filePath), error => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                resolve();
+            });
         });
-        await dDoneWithFile.pr;
     };
-    const readFile = (entry) => new Promise(resolve => zipFile.openReadStream(entry, async (error, readStream) => {
-        if (error) {
-            dDone.reject(error);
-            return;
-        }
-        const chunks = [];
-        readStream.on("data", chunk => {
-            chunks.push(chunk);
-        });
-        readStream.on("end", () => {
-            resolve(Buffer.concat(chunks));
-        });
-        readStream.on("error", error => {
-            dDone.reject(error);
+    const readFile = async (entry) => {
+        const readStream = await zipFile.openReadStreamPromise(entry);
+        return new Promise((resolve, reject) => {
+            const chunks = [];
+            readStream.on("data", chunk => {
+                chunks.push(chunk);
+            });
+            readStream.on("end", () => {
+                resolve(Buffer.concat(chunks));
+            });
+            readStream.on("error", reject);
         });
-    }));
-    zipFile.on("entry", async (entry) => {
-        handle_file: {
-            // NOTE: Skip directories
-            if (entry.fileName.endsWith("/")) {
-                break handle_file;
-            }
-            let hasEarlyExitBeenCalled = false;
-            await onArchiveFile({
-                relativeFilePathInArchive: entry.fileName.split("/").join(external_path_.sep),
-                readFile: () => readFile(entry),
-                writeFile: params => writeFile(entry, params),
-                earlyExit: () => {
-                    hasEarlyExitBeenCalled = true;
+    };
+    try {
+        for (var _d = true, _e = __asyncValues(zipFile.eachEntry()), _f; _f = await _e.next(), _a = _f.done, !_a;) {
+            _c = _f.value;
+            _d = false;
+            try {
+                const entry = _c;
+                handle_file: {
+                    // NOTE: Skip directories
+                    if (entry.fileName.endsWith("/")) {
+                        break handle_file;
+                    }
+                    let hasEarlyExitBeenCalled = false;
+                    await onArchiveFile({
+                        relativeFilePathInArchive: entry.fileName.split("/").join(external_path_.sep),
+                        readFile: () => readFile(entry),
+                        writeFile: params => writeFile(entry, params),
+                        earlyExit: () => {
+                            hasEarlyExitBeenCalled = true;
+                        }
+                    });
+                    if (hasEarlyExitBeenCalled) {
+                        zipFile.close();
+                        return;
+                    }
                 }
-            });
-            if (hasEarlyExitBeenCalled) {
-                zipFile.close();
-                dDone.resolve();
-                return;
+            }
+            finally {
+                _d = true;
             }
         }
-        zipFile.readEntry();
-    });
-    zipFile.readEntry();
-    await dDone.pr;
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
 }
 //# sourceMappingURL=extractArchive.js.map
+// EXTERNAL MODULE: ./node_modules/evt/tools/Deferred.js
+var Deferred = __webpack_require__(50689);
 // EXTERNAL MODULE: ./node_modules/tsafe/esm/id.mjs
 var id = __webpack_require__(38469);
 // EXTERNAL MODULE: ./node_modules/zod/lib/index.mjs
@@ -249,7 +247,7 @@ async function appBuild(params) {
         }
         const dIsSuccess = new Deferred.Deferred();
         console.log(source_default().blue("$ npx vite build"));
-        const child = external_child_process_.spawn("npx", ["vite", "build"], {
+        const child = external_child_process_.spawn("npx vite build", {
             cwd: buildContext.projectDirPath,
             shell: true
         });
@@ -311,7 +309,7 @@ async function keycloakifyBuild(params) {
     const { buildForKeycloakMajorVersionNumber, buildContext } = params;
     const dResult = new Deferred.Deferred();
     console.log(source_default().blue("$ npx keycloakify build"));
-    const child = external_child_process_.spawn("npx", ["keycloakify", "build"], {
+    const child = external_child_process_.spawn("npx keycloakify build", {
         cwd: buildContext.projectDirPath,
         env: Object.assign(Object.assign({}, process.env), { [constants/* BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME */.ac]: `${buildForKeycloakMajorVersionNumber}` }),
         shell: true
@@ -536,7 +534,7 @@ var SuccessTracker;
 function startViteDevServer(params) {
     const { buildContext } = params;
     console.log(source_default().blue(`$ npx vite dev`));
-    const child = external_child_process_.spawn("npx", ["vite", "dev"], {
+    const child = external_child_process_.spawn("npx vite dev", {
         cwd: buildContext.projectDirPath,
         env: Object.assign(Object.assign({}, process.env), { [constants/* VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.READ_KC_CONTEXT_FROM_URL */.TE.READ_KC_CONTEXT_FROM_URL]: "true" }),
         shell: true
@@ -1327,7 +1325,7 @@ async function dumpContainerConfig(params) {
     }
     {
         const dCompleted = new Deferred.Deferred();
-        const child = external_child_process_default().spawn("docker", [
+        const dockerArguments = [
             ...["exec", constants/* CONTAINER_NAME */.sv],
             ...["/opt/keycloak/bin/kc.sh", "export"],
             ...["--dir", "/tmp"],
@@ -1342,7 +1340,8 @@ async function dumpContainerConfig(params) {
                         '"jdbc:h2:file:/tmp/h2/keycloakdb;NON_KEYWORDS=VALUE"'
                     ]
                 ])
-        ], { shell: true });
+        ];
+        const child = external_child_process_default().spawn("docker " + dockerArguments.join(" "), { shell: true });
         let output = "";
         const onExit = (code) => {
             dCompleted.reject(new Error(`docker exec kc.sh export command failed with code ${code}`));
@@ -1909,7 +1908,8 @@ async function command(params) {
             .map(arg => arg.replace(new RegExp(SPACE_PLACEHOLDER, "g"), " "))
             .map((line, i, arr) => `    ${line}${arr.length - 1 === i ? "" : " \\"}`)
     ].join("\n")));
-    const child = external_child_process_.spawn("docker", ["run", ...dockerRunArgs.map(line => line.split(SPACE_PLACEHOLDER)).flat()], { shell: true });
+    const child = external_child_process_.spawn("docker run " +
+        dockerRunArgs.map(line => line.split(SPACE_PLACEHOLDER)).flat().join(" "), { shell: true });
     child.stdout.on("data", async (data) => {
         if (data.toString("utf8").includes("keycloakify-logging: REALM_CONFIG_CHANGED")) {
             await onRealmConfigChange();

package/bin/502.index.js

@@ -301,7 +301,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