@coana-tech/cli 14.12.115 → 14.12.117

package/cli.mjs

@@ -30394,12 +30394,12 @@ var require_lodash = __commonJS({
           return result2;
         });
         function omitBy(object, predicate) {
-          return pickBy2(object, negate(getIteratee(predicate)));
+          return pickBy3(object, negate(getIteratee(predicate)));
         }
-        var pick2 = flatRest(function(object, paths) {
+        var pick = flatRest(function(object, paths) {
           return object == null ? {} : basePick(object, paths);
         });
-        function pickBy2(object, predicate) {
+        function pickBy3(object, predicate) {
           if (object == null) {
             return {};
           }
@@ -31074,8 +31074,8 @@ var require_lodash = __commonJS({
         lodash16.partial = partial;
         lodash16.partialRight = partialRight;
         lodash16.partition = partition2;
-        lodash16.pick = pick2;
-        lodash16.pickBy = pickBy2;
+        lodash16.pick = pick;
+        lodash16.pickBy = pickBy3;
         lodash16.property = property;
         lodash16.propertyOf = propertyOf;
         lodash16.pull = pull;
@@ -68492,7 +68492,7 @@ var require_omit = __commonJS({
 var require_pickBy = __commonJS({
   "../../node_modules/.pnpm/@pnpm+ramda@0.28.1/node_modules/@pnpm/ramda/src/pickBy.js"(exports2, module2) {
     var _curry2 = require_curry2();
-    var pickBy2 = /* @__PURE__ */ _curry2(function pickBy3(test2, obj) {
+    var pickBy3 = /* @__PURE__ */ _curry2(function pickBy4(test2, obj) {
       var result = {};
       for (var prop2 in obj) {
         if (test2(obj[prop2], prop2, obj)) {
@@ -68501,7 +68501,7 @@ var require_pickBy = __commonJS({
       }
       return result;
     });
-    module2.exports = pickBy2;
+    module2.exports = pickBy3;
   }
 });
 
@@ -68509,7 +68509,7 @@ var require_pickBy = __commonJS({
 var require_pick = __commonJS({
   "../../node_modules/.pnpm/@pnpm+ramda@0.28.1/node_modules/@pnpm/ramda/src/pick.js"(exports2, module2) {
     var _curry2 = require_curry2();
-    var pick2 = /* @__PURE__ */ _curry2(function pick3(names, obj) {
+    var pick = /* @__PURE__ */ _curry2(function pick2(names, obj) {
       var result = {};
       var idx = 0;
       while (idx < names.length) {
@@ -68520,7 +68520,7 @@ var require_pick = __commonJS({
       }
       return result;
     });
-    module2.exports = pick2;
+    module2.exports = pick;
   }
 });
 
@@ -234982,6 +234982,8 @@ var SocketLogServer = class {
   writeStream;
   writeQueue = [];
   isWriting = false;
+  isClosing = false;
+  onDrainCallback = null;
   clients = /* @__PURE__ */ new Map();
   constructor(options) {
     this.socketPath = options.socketPath;
@@ -235040,6 +235042,9 @@ var SocketLogServer = class {
     return message2.type === "handshake";
   }
   writeLog(log2) {
+    if (this.isClosing) {
+      return;
+    }
     const label = log2.label ?? log2.context;
     const formattedLog = `${log2.timestamp} ${label} ${log2.level}: ${log2.message}
 `;
@@ -235052,6 +235057,11 @@ var SocketLogServer = class {
   }
   processWriteQueue() {
     if (this.isWriting || this.writeQueue.length === 0) {
+      if (!this.isWriting && this.writeQueue.length === 0 && this.onDrainCallback) {
+        const callback = this.onDrainCallback;
+        this.onDrainCallback = null;
+        callback();
+      }
       return;
     }
     this.isWriting = true;
@@ -235071,11 +235081,37 @@ var SocketLogServer = class {
       this.onLogReceived(log2);
     }
   }
+  async waitForQueueDrain(timeoutMs = 2e4) {
+    return new Promise((resolve45) => {
+      if (!this.isWriting && this.writeQueue.length === 0) {
+        resolve45();
+        return;
+      }
+      let resolved = false;
+      const timeoutId = setTimeout(() => {
+        if (!resolved) {
+          resolved = true;
+          this.onDrainCallback = null;
+          console.warn(`Log write queue drain timeout after ${timeoutMs}ms, proceeding with close`);
+          resolve45();
+        }
+      }, timeoutMs);
+      this.onDrainCallback = () => {
+        if (!resolved) {
+          resolved = true;
+          clearTimeout(timeoutId);
+          resolve45();
+        }
+      };
+    });
+  }
   async close() {
     for (const client of this.clients.values()) {
       client.socket.destroy();
     }
     this.clients.clear();
+    this.isClosing = true;
+    await this.waitForQueueDrain();
     return new Promise((resolve45, reject) => {
       this.server.close((serverError) => {
         this.writeStream.end(() => {
@@ -250908,10 +250944,10 @@ async function onlineScan(dependencyTree, apiKey, timeout) {
 }
 
 // dist/version.js
-var version3 = "14.12.115";
+var version3 = "14.12.117";
 
 // dist/cli-core.js
-var { mapValues, omit, partition, pick } = import_lodash15.default;
+var { mapValues, omit, partition, pickBy: pickBy2 } = import_lodash15.default;
 var bucketedAnalysisTimeoutInSeconds = 60;
 var SEVERITY_ORDER = {
   INFO: 0,
@@ -251156,7 +251192,8 @@ var CliCore = class {
       vulnsWithResults.push(...Object.values(vulnerabilities).flat());
       for (const [workspacePath, workspaceDiagnostics] of Object.entries(diagnostics)) {
         allWorkspaceDiagnostics.push({
-          subprojectPath: relative20(this.rootWorkingDirectory, workspacePath) || ".",
+          // the workspace path is the subproject path in socket mode
+          subprojectPath: workspacePath ?? ".",
           workspacePath: ".",
           purl_type: getPurlType(ecosystem),
           diagnostics: workspaceDiagnostics
@@ -251389,18 +251426,19 @@ Subproject: ${subproject}`);
     this.verifyOptions();
     if (!this.options.excludeDirs)
       this.options.excludeDirs = await inferExcludeDirsFromConfigurationFiles(this.rootWorkingDirectory);
-    logger.debug("running in debug mode");
-    logger.info("using options", JSON.stringify(pick(this.options, [
-      "debug",
-      "silent",
-      "memoryLimit",
-      "timeout",
-      "analysisTimeout",
-      "concurrency",
-      "excludeDirs",
-      "useUnreachableFromPrecomputation",
-      "minSeverity"
-    ]), null, 2));
+    logger.info("using options", JSON.stringify(pickBy2(this.options, (value2, key) => {
+      return [
+        "debug",
+        "silent",
+        "memoryLimit",
+        "analysisTimeout",
+        "concurrency",
+        "excludeDirs",
+        "includeDirs",
+        "purlTypes",
+        "minSeverity"
+      ].includes(key) && value2 !== void 0 && value2 !== false;
+    }), null, 2));
     logger.info("available memory: %i MiB", os.freemem() / (1024 * 1024));
     try {
       const limits = await Promise.all([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coana-tech/cli",
-  "version": "14.12.115",
+  "version": "14.12.117",
   "description": "Coana CLI",
   "type": "module",
   "bin": {