@socketsecurity/cli-with-sentry 0.14.62 → 0.14.64

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

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+import { Remap } from '@socketsecurity/registry/lib/objects';
+import { Abortable } from 'node:events';
+import { ObjectEncodingOptions, OpenMode, PathLike, PathOrFileDescriptor } from 'node:fs';
+import { FileHandle } from 'node:fs/promises';
+type FindUpOptions = {
+    cwd?: string | undefined;
+    signal?: AbortSignal | undefined;
+};
+declare function findUp(name: string | string[], { cwd, signal }: FindUpOptions): Promise<string | undefined>;
+type ReadFileOptions = Remap<ObjectEncodingOptions & Abortable & {
+    flag?: OpenMode | undefined;
+}>;
+declare function readFileBinary(filepath: PathLike | FileHandle, options?: ReadFileOptions | undefined): Promise<Buffer>;
+declare function readFileUtf8(filepath: PathLike | FileHandle, options?: ReadFileOptions | undefined): Promise<string>;
+declare function safeReadFile(filepath: PathLike | FileHandle, options?: 'utf8' | 'utf-8' | {
+    encoding: 'utf8' | 'utf-8';
+} | undefined): Promise<string | undefined>;
+declare function safeReadFileSync(filepath: PathOrFileDescriptor, options?: 'utf8' | 'utf-8' | {
+    encoding: 'utf8' | 'utf-8';
+} | undefined): string | undefined;
+export { FindUpOptions, findUp, ReadFileOptions, readFileBinary, readFileUtf8, safeReadFile, safeReadFileSync };

package/dist/module-sync/shadow-npm-inject.js

@@ -9,6 +9,7 @@ function _socketInterop(e) {
   return c ? e.default : e
 }
 
+var shadowNpmPaths = require('./shadow-npm-paths.js');
 var process$1 = require('node:process');
 var logger = require('@socketsecurity/registry/lib/logger');
 var prompts = require('@socketsecurity/registry/lib/prompts');
@@ -19,7 +20,6 @@ var registry = require('@socketsecurity/registry');
 var arrays = require('@socketsecurity/registry/lib/arrays');
 var debug = require('@socketsecurity/registry/lib/debug');
 var objects = require('@socketsecurity/registry/lib/objects');
-var shadowNpmPaths = require('./shadow-npm-paths.js');
 var npa = _socketInterop(require('npm-package-arg'));
 var events = require('node:events');
 var https = require('node:https');
@@ -142,18 +142,25 @@ function safeReadFileSync(filepath, options) {
   return undefined;
 }
 
+// Default app data folder env var on Win
 const LOCALAPPDATA = 'LOCALAPPDATA';
+// Default app data folder env var on Mac/Linux
+const XDG_DATA_HOME = 'XDG_DATA_HOME';
+const SOCKET_APP_DIR = 'socket/settings';
 const supportedApiKeys = new Set(['apiBaseUrl', 'apiKey', 'apiProxy', 'enforcedOrgs']);
-let _settings;
+let settings;
+let settingsPath;
+let warnedSettingPathWin32Missing = false;
+let pendingSave = false;
 function getSettings() {
-  if (_settings === undefined) {
-    _settings = {};
+  if (settings === undefined) {
+    settings = {};
     const settingsPath = getSettingsPath();
     if (settingsPath) {
       const raw = safeReadFileSync(settingsPath);
       if (raw) {
         try {
-          Object.assign(_settings, JSON.parse(Buffer.from(raw, 'base64').toString()));
+          Object.assign(settings, JSON.parse(Buffer.from(raw, 'base64').toString()));
         } catch {
           logger.logger.warn(`Failed to parse settings at ${settingsPath}`);
         }
@@ -164,30 +171,40 @@ function getSettings() {
       }
     }
   }
-  return _settings;
+  return settings;
 }
-let _settingsPath;
-let _warnedSettingPathWin32Missing = false;
 function getSettingsPath() {
-  if (_settingsPath === undefined) {
+  // Get the OS app data folder:
+  // - Win: %LOCALAPPDATA% or fail?
+  // - Mac: %XDG_DATA_HOME% or fallback to "~/Library/Application Support/"
+  // - Linux: %XDG_DATA_HOME% or fallback to "~/.local/share/"
+  // Note: LOCALAPPDATA is typically: C:\Users\USERNAME\AppData
+  // Note: XDG stands for "X Desktop Group", nowadays "freedesktop.org"
+  //       On most systems that path is: $HOME/.local/share
+  // Then append `socket/settings`, so:
+  // - Win: %LOCALAPPDATA%\socket\settings or return undefined
+  // - Mac: %XDG_DATA_HOME%/socket/settings or "~/Library/Application Support/socket/settings"
+  // - Linux: %XDG_DATA_HOME%/socket/settings or "~/.local/share/socket/settings"
+
+  if (settingsPath === undefined) {
     // Lazily access constants.WIN32.
     const {
       WIN32
     } = constants;
-    let dataHome = WIN32 ? process$1.env[LOCALAPPDATA] : process$1.env['XDG_DATA_HOME'];
+    let dataHome = WIN32 ? process$1.env[LOCALAPPDATA] : process$1.env[XDG_DATA_HOME];
     if (!dataHome) {
       if (WIN32) {
-        if (!_warnedSettingPathWin32Missing) {
-          _warnedSettingPathWin32Missing = true;
+        if (!warnedSettingPathWin32Missing) {
+          warnedSettingPathWin32Missing = true;
           logger.logger.warn(`Missing %${LOCALAPPDATA}%`);
         }
       } else {
         dataHome = path.join(os.homedir(), ...(process$1.platform === 'darwin' ? ['Library', 'Application Support'] : ['.local', 'share']));
       }
     }
-    _settingsPath = dataHome ? path.join(dataHome, 'socket/settings') : undefined;
+    settingsPath = dataHome ? path.join(dataHome, SOCKET_APP_DIR) : undefined;
   }
-  return _settingsPath;
+  return settingsPath;
 }
 function normalizeSettingsKey(key) {
   const normalizedKey = key === 'apiToken' ? 'apiKey' : key;
@@ -224,7 +241,6 @@ function findSocketYmlSync() {
 function getSetting(key) {
   return getSettings()[normalizeSettingsKey(key)];
 }
-let pendingSave = false;
 function updateSetting(key, value) {
   const settings = getSettings();
   settings[normalizeSettingsKey(key)] = value;
@@ -285,20 +301,15 @@ async function setupSdk(apiToken = getDefaultToken(), apiBaseUrl = getDefaultApi
     throw new AuthError('You need to provide an API key');
   }
   return new sdk.SocketSdk(apiToken, {
-    agent: proxy ? {
-      http: new hpagent.HttpProxyAgent({
-        proxy
-      }),
-      https: new hpagent.HttpsProxyAgent({
-        proxy
-      })
-    } : undefined,
+    agent: proxy ? new hpagent.HttpsProxyAgent({
+      proxy
+    }) : undefined,
     baseUrl: apiBaseUrl,
     userAgent: sdk.createUserAgentFromPkgJson({
       // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_NAME']".
       name: "@socketsecurity/cli",
       // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-      version: "0.14.62",
+      version: "0.14.64",
       // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_HOMEPAGE']".
       homepage: "https://github.com/SocketDev/socket-cli"
     })
@@ -1899,7 +1910,7 @@ const {
   SOCKET_CLI_SAFE_WRAPPER,
   kInternalsSymbol,
   [kInternalsSymbol]: {
-    getIPC
+    getIpc
   }
 } = constants;
 const SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES = {
@@ -1948,7 +1959,7 @@ class SafeArborist extends Arborist {
       __proto__: null,
       ...(args.length ? args[0] : undefined)
     };
-    const safeWrapperName = options.dryRun ? undefined : await getIPC(SOCKET_CLI_SAFE_WRAPPER);
+    const safeWrapperName = options.dryRun ? undefined : await getIpc(SOCKET_CLI_SAFE_WRAPPER);
     const isSafeNpm = safeWrapperName === NPM;
     const isSafeNpx = safeWrapperName === NPX;
     if (!safeWrapperName || isSafeNpx && options['yes']) {
@@ -2038,5 +2049,5 @@ exports.safeReadFile = safeReadFile;
 exports.setupSdk = setupSdk;
 exports.updateNode = updateNode;
 exports.updateSetting = updateSetting;
-//# debugId=327bfdd5-e0f5-4368-aec8-8cc04a9327c0
+//# debugId=784d0ad3-abe9-4ea9-b089-280204b58b78
 //# sourceMappingURL=shadow-npm-inject.js.map