@socketsecurity/cli-with-sentry 0.14.49 → 0.14.51

package/dist/module-sync/index.d.ts

@@ -2,7 +2,7 @@
 import { SafeEdge } from "./edge.js";
 import { SafeNode } from "./node.js";
 import indentString from "@socketregistry/indent-string/index.cjs";
-import { LogSymbols } from "./logging.js";
+import { LogSymbols } from "@socketsecurity/registry/lib/logger";
 import { SocketSdkResultType } from "@socketsecurity/sdk";
 import { Diff, ArboristClass } from "./types.js";
 import { ObjectEncodingOptions, OpenMode, PathLike } from "node:fs";

package/dist/module-sync/index.js

@@ -34,6 +34,7 @@ var npmPaths = require('./npm-paths.js');
 var fs = require('node:fs');
 var os = require('node:os');
 var config = require('@socketsecurity/config');
+var logger = require('@socketsecurity/registry/lib/logger');
 var terminalLink = _socketInterop(require('terminal-link'));
 var colors = _socketInterop(require('yoctocolors-cjs'));
 var indentString = require('@socketregistry/indent-string/index.cjs');
@@ -134,7 +135,7 @@ function getSettings() {
         try {
           Object.assign(_settings, JSON.parse(Buffer.from(raw, 'base64').toString()));
         } catch {
-          npmPaths.logger.warn(`Failed to parse settings at ${settingsPath}`);
+          logger.logger.warn(`Failed to parse settings at ${settingsPath}`);
         }
       } else {
         fs.mkdirSync(path.dirname(settingsPath), {
@@ -158,7 +159,7 @@ function getSettingsPath() {
       if (WIN32) {
         if (!_warnedSettingPathWin32Missing) {
           _warnedSettingPathWin32Missing = true;
-          npmPaths.logger.warn(`Missing %${LOCALAPPDATA}%`);
+          logger.logger.warn(`Missing %${LOCALAPPDATA}%`);
         }
       } else {
         dataHome = path.join(os.homedir(), ...(process.platform === 'darwin' ? ['Library', 'Application Support'] : ['.local', 'share']));
@@ -219,6 +220,10 @@ function updateSetting(key, value) {
   }
 }
 
+const {
+  SOCKET_CLI_NO_API_TOKEN
+} = constants;
+
 // The API server that should be used for operations.
 function getDefaultApiBaseUrl() {
   const baseUrl = process.env['SOCKET_SECURITY_API_BASE_URL'] || getSetting('apiBaseUrl');
@@ -234,11 +239,16 @@ function getDefaultHttpProxy() {
 // This API key should be stored globally for the duration of the CLI execution.
 let _defaultToken;
 function getDefaultToken() {
-  const key = process.env['SOCKET_SECURITY_API_TOKEN'] ||
-  // Keep 'SOCKET_SECURITY_API_KEY' as an alias of 'SOCKET_SECURITY_API_TOKEN'.
-  // TODO: Remove 'SOCKET_SECURITY_API_KEY' alias.
-  process.env['SOCKET_SECURITY_API_KEY'] || getSetting('apiToken') || _defaultToken;
-  _defaultToken = strings.isNonEmptyString(key) ? key : undefined;
+  // Lazily access constants.ENV[SOCKET_CLI_NO_API_TOKEN].
+  if (constants.ENV[SOCKET_CLI_NO_API_TOKEN]) {
+    _defaultToken = undefined;
+  } else {
+    const key = process.env['SOCKET_SECURITY_API_TOKEN'] ||
+    // Keep 'SOCKET_SECURITY_API_KEY' as an alias of 'SOCKET_SECURITY_API_TOKEN'.
+    // TODO: Remove 'SOCKET_SECURITY_API_KEY' alias.
+    process.env['SOCKET_SECURITY_API_KEY'] || getSetting('apiToken') || _defaultToken;
+    _defaultToken = strings.isNonEmptyString(key) ? key : undefined;
+  }
   return _defaultToken;
 }
 function getPublicToken() {
@@ -366,7 +376,7 @@ const {
   ALERT_TYPE_SOCKET_UPGRADE_AVAILABLE,
   CVE_ALERT_PROPS_FIRST_PATCHED_VERSION_IDENTIFIER: CVE_ALERT_PROPS_FIRST_PATCHED_VERSION_IDENTIFIER$1,
   CVE_ALERT_PROPS_VULNERABLE_VERSION_RANGE,
-  abortSignal: abortSignal$2
+  abortSignal: abortSignal$1
 } = constants;
 async function* createBatchGenerator(chunk) {
   // Adds the first 'abort' listener to abortSignal.
@@ -377,7 +387,7 @@ async function* createBatchGenerator(chunk) {
     headers: {
       Authorization: `Basic ${btoa(`${getPublicToken()}:`)}`
     },
-    signal: abortSignal$2
+    signal: abortSignal$1
   }).end(JSON.stringify({
     components: chunk.map(id => ({
       purl: `pkg:npm/${id}`
@@ -387,7 +397,7 @@ async function* createBatchGenerator(chunk) {
   const {
     0: res
   } = await events.once(req, 'response', {
-    signal: abortSignal$2
+    signal: abortSignal$1
   });
   const ok = res.statusCode >= 200 && res.statusCode <= 299;
   if (!ok) {
@@ -396,7 +406,7 @@ async function* createBatchGenerator(chunk) {
   const rli = readline.createInterface({
     input: res,
     crlfDelay: Infinity,
-    signal: abortSignal$2
+    signal: abortSignal$1
   });
   for await (const line of rli) {
     yield JSON.parse(line);
@@ -407,11 +417,11 @@ async function* batchScan(pkgIds, concurrencyLimit = 50) {
   // abortSignal so we multiply the concurrencyLimit by 2.
   const neededMaxListeners = concurrencyLimit * 2;
   // Increase abortSignal max listeners count to avoid Node's MaxListenersExceededWarning.
-  const oldAbortSignalMaxListeners = events.getMaxListeners(abortSignal$2);
+  const oldAbortSignalMaxListeners = events.getMaxListeners(abortSignal$1);
   let abortSignalMaxListeners = oldAbortSignalMaxListeners;
   if (oldAbortSignalMaxListeners < neededMaxListeners) {
     abortSignalMaxListeners = oldAbortSignalMaxListeners + neededMaxListeners;
-    events.setMaxListeners(abortSignalMaxListeners, abortSignal$2);
+    events.setMaxListeners(abortSignalMaxListeners, abortSignal$1);
   }
   const {
     length: pkgIdsCount
@@ -462,7 +472,7 @@ async function* batchScan(pkgIds, concurrencyLimit = 50) {
   }
   // Reset abortSignal max listeners count.
   if (abortSignalMaxListeners > oldAbortSignalMaxListeners) {
-    events.setMaxListeners(oldAbortSignalMaxListeners, abortSignal$2);
+    events.setMaxListeners(oldAbortSignalMaxListeners, abortSignal$1);
   }
 }
 function isArtifactAlertCveFixable(alert) {
@@ -476,7 +486,7 @@ function isArtifactAlertUpgradeFixable(alert) {
 }
 
 const {
-  abortSignal: abortSignal$1
+  abortSignal
 } = constants;
 const ERROR_UX = {
   block: true,
@@ -613,7 +623,7 @@ async function uxLookup(settings) {
   while (_uxLookup === undefined) {
     // eslint-disable-next-line no-await-in-loop
     await promises.setTimeout(1, {
-      signal: abortSignal$1
+      signal: abortSignal
     });
   }
   return _uxLookup(settings);
@@ -688,13 +698,13 @@ void (async () => {
   _uxLookup = createAlertUXLookup(settings);
 })();
 
-const markdownLogSymbols = {
+const markdownLogSymbols = Object.freeze({
   __proto__: null,
   info: ':information_source:',
   error: ':stop_sign:',
   success: ':white_check_mark:',
   warning: ':warning:'
-};
+});
 class ColorOrMarkdown {
   constructor(useMarkdown) {
     this.useMarkdown = !!useMarkdown;
@@ -730,7 +740,7 @@ class ColorOrMarkdown {
     return this.useMarkdown ? `* ${indentedContent.join('\n* ')}\n` : `${indentedContent.join('\n')}\n`;
   }
   get logSymbols() {
-    return this.useMarkdown ? markdownLogSymbols : npmPaths.getLogSymbols();
+    return this.useMarkdown ? markdownLogSymbols : logger.Logger.LOG_SYMBOLS;
   }
 }
 
@@ -1446,8 +1456,7 @@ const {
   NPM_REGISTRY_URL,
   OVERRIDES,
   PNPM,
-  RESOLUTIONS,
-  abortSignal
+  RESOLUTIONS
 } = constants;
 const formatter = new ColorOrMarkdown(false);
 function findBestPatchVersion(node, availableVersions, vulnerableVersionRange, _firstPatchedVersionIdentifier) {
@@ -1755,8 +1764,7 @@ async function reify(...args) {
     default: false
   }, {
     input,
-    output,
-    signal: abortSignal
+    output
   }))) {
     throw new Error('Socket npm exiting due to risks');
   }
@@ -1858,5 +1866,5 @@ exports.safeReadFile = safeReadFile;
 exports.setupSdk = setupSdk;
 exports.updateNode = updateNode;
 exports.updateSetting = updateSetting;
-//# debugId=ef8c61fe-d663-4083-9f0b-171ef78dda81
+//# debugId=d413b96a-751b-43c9-8ce7-50c11ea5826
 //# sourceMappingURL=index.js.map