@sinch/cli 0.4.7 → 0.4.8

package/bin/platform-resolver.js

@@ -0,0 +1,61 @@
+const fs = require('fs');
+const path = require('path');
+
+const PLATFORM_BINARIES = {
+  'darwin-arm64': { artifactName: 'sinch-darwin-arm64' },
+  'darwin-x64': { artifactName: 'sinch-darwin-x64' },
+  'linux-arm64': { artifactName: 'sinch-linux-arm64' },
+  'linux-x64': { artifactName: 'sinch-linux-x64' },
+  'win32-arm64': { artifactName: 'sinch-windows-x64.exe' },
+  'win32-x64': { artifactName: 'sinch-windows-x64.exe' },
+};
+
+function getPlatformKey(platform = process.platform, arch = process.arch) {
+  return `${platform}-${arch}`;
+}
+
+function getPlatformBinaryInfo(platform = process.platform, arch = process.arch) {
+  return PLATFORM_BINARIES[getPlatformKey(platform, arch)] ?? null;
+}
+
+function buildMissingBinaryMessage(platform, arch, binaryPath) {
+  const binaryHint = binaryPath
+    ? `Expected binary at ${binaryPath}.`
+    : 'No binary mapping is defined for this platform.';
+
+  return [
+    `Sinch CLI does not have an installed binary for ${platform}-${arch}.`,
+    binaryHint,
+    'Common causes: unsupported platform, install scripts were disabled, or the binary download failed.',
+    'Try reinstalling with: npm install -g @sinch/cli',
+  ].join(' ');
+}
+
+function resolveInstalledBinaryPath(
+  packageRoot = path.join(__dirname, '..'),
+  platform = process.platform,
+  arch = process.arch
+) {
+  const binaryInfo = getPlatformBinaryInfo(platform, arch);
+  if (!binaryInfo) {
+    throw new Error(buildMissingBinaryMessage(platform, arch, null));
+  }
+
+  const binaryPath = path.join(packageRoot, 'dist', binaryInfo.artifactName);
+  if (!fs.existsSync(binaryPath)) {
+    throw new Error(buildMissingBinaryMessage(platform, arch, binaryPath));
+  }
+
+  return {
+    binaryPath,
+    artifactName: binaryInfo.artifactName,
+  };
+}
+
+module.exports = {
+  PLATFORM_BINARIES,
+  getPlatformKey,
+  getPlatformBinaryInfo,
+  buildMissingBinaryMessage,
+  resolveInstalledBinaryPath,
+};

package/bin/sinch

@@ -1,17 +1,40 @@
-#!/bin/sh
-# Native launcher — execs the Bun-compiled binary, no Node.js required.
-# npm registers this via the "bin" field in package.json.
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ARCH="$(uname -m)"
-case "$ARCH" in
-  x86_64|amd64) ARCH="x64" ;;
-  aarch64|arm64) ARCH="arm64" ;;
-esac
-OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
-BINARY="$SCRIPT_DIR/../dist/sinch-${OS}-${ARCH}"
-if [ ! -f "$BINARY" ]; then
-  echo "Sinch CLI binary not found: $BINARY" >&2
-  echo "Reinstall with: npm install -g @sinch/cli" >&2
-  exit 1
-fi
-exec "$BINARY" "$@"
+#!/usr/bin/env node
+
+const { spawn } = require('child_process');
+const { resolveInstalledBinaryPath } = require('./platform-resolver');
+
+function main(argv = process.argv.slice(2)) {
+  let resolved;
+
+  try {
+    resolved = resolveInstalledBinaryPath();
+  } catch (error) {
+    console.error(error.message);
+    process.exit(1);
+  }
+
+  const child = spawn(resolved.binaryPath, argv, {
+    stdio: 'inherit',
+  });
+
+  child.on('error', (error) => {
+    console.error(`Failed to launch ${resolved.artifactName}: ${error.message}`);
+    process.exit(1);
+  });
+
+  child.on('exit', (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal);
+      return;
+    }
+    process.exit(code ?? 0);
+  });
+}
+
+if (require.main === module) {
+  main();
+}
+
+module.exports = {
+  main,
+};

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@sinch/cli",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Official Sinch CLI - Manage all Sinch products from your terminal",
+  "main": "bin/sinch",
   "bin": {
-    "sinch": "bin/sinch",
-    "s": "bin/s"
+    "sinch": "bin/sinch"
   },
   "files": [
     "bin/",

package/scripts/postinstall.js

@@ -3,10 +3,9 @@
 /**
  * postinstall.js — runs on `npm install -g @sinch/cli`
  *
- * 1. Writes ~/.sinch/completions.json (command tree for PowerShell)
- * 2. Installs shell completion into the user's profile (PowerShell, zsh, or bash)
- *
- * Silent failure on ALL errors — must never break `npm install`.
+ * 1. Downloads the platform binary from GitLab Generic Packages
+ * 2. Writes ~/.sinch/completions.json (command tree for PowerShell)
+ * 3. Installs shell completion into the user's profile (PowerShell, zsh, or bash)
  *
  * Keep COMPLETION_COMMANDS in sync with src/index.ts.
  */
@@ -15,13 +14,12 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const https = require('https');
-const { spawn } = require('child_process');
+const { execSync, spawn } = require('child_process');
+const { getPlatformBinaryInfo } = require('../bin/platform-resolver');
 
 const SINCH_DIR = path.join(os.homedir(), '.sinch');
 const PROJECT_ID = '72974711';
 
-// Keep in sync with COMPLETION_COMMANDS in src/index.ts.
-// The postAction hook overwrites completions.json on every CLI run, so drift self-heals.
 const COMPLETION_COMMANDS = {
   functions: ['init', 'list', 'deploy', 'download', 'dev', 'status', 'logs', 'delete', 'docs'],
   templates: ['list', 'show', 'node', 'csharp', 'python'],
@@ -90,20 +88,41 @@ Register-ArgumentCompleter -Native -CommandName sinch -ScriptBlock {
 ${SENTINEL_END}`;
 }
 
-// --- Profile installation helpers ---
-
 function shellEscapePath(p) {
   return "'" + p.replace(/'/g, "'\\''") + "'";
 }
 
+function stripManagedBlocks(content) {
+  let nextContent = content;
+  let startIndex = nextContent.indexOf(SENTINEL_START);
+
+  while (startIndex !== -1) {
+    const lineStart = nextContent.lastIndexOf('\n', startIndex - 1) + 1;
+    const endIndex = nextContent.indexOf(SENTINEL_END, startIndex);
+    let removalEnd = endIndex === -1 ? nextContent.length : endIndex + SENTINEL_END.length;
+
+    if (nextContent.slice(removalEnd, removalEnd + 2) === '\r\n') {
+      removalEnd += 2;
+    } else if (nextContent[removalEnd] === '\n') {
+      removalEnd += 1;
+    }
+
+    nextContent = nextContent.slice(0, lineStart) + nextContent.slice(removalEnd);
+    startIndex = nextContent.indexOf(SENTINEL_START);
+  }
+
+  return nextContent.replace(/\n{3,}/g, '\n\n').trimEnd();
+}
+
 function upsertBlock(content, block) {
-  const pattern =
-    SENTINEL_START.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') +
-    '[\\s\\S]*?' +
-    SENTINEL_END.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  const replaced = content.replace(new RegExp(pattern, 'g'), block.trim());
-  if (replaced !== content) return replaced;
-  return content + (content && !content.endsWith('\n') ? '\n' : '') + '\n' + block.trim() + '\n';
+  const normalizedBlock = block.trim();
+  const strippedContent = stripManagedBlocks(content);
+
+  if (!strippedContent) {
+    return normalizedBlock + '\n';
+  }
+
+  return `${strippedContent}\n\n${normalizedBlock}\n`;
 }
 
 function tryShell(cmd) {
@@ -125,7 +144,6 @@ async function installPowerShellCompletion() {
   const profilePath = (await tryShell('pwsh')) ?? (await tryShell('powershell'));
   if (!profilePath) return;
 
-  // Validate profile path is within user's home directory
   const resolved = path.resolve(profilePath);
   if (!resolved.startsWith(os.homedir())) return;
 
@@ -134,9 +152,7 @@ async function installPowerShellCompletion() {
   let content = '';
   try {
     content = fs.readFileSync(resolved, 'utf8');
-  } catch {
-    // Profile doesn't exist yet — will be created
-  }
+  } catch {}
 
   const sourceLine = `. ${shellEscapePath(completionFile.replace(/\\/g, '\\\\'))}`;
   const block = `${SENTINEL_START}\n${sourceLine}\n${SENTINEL_END}`;
@@ -166,57 +182,67 @@ function installBashZshCompletion() {
     let content = '';
     try {
       content = fs.readFileSync(rcFile, 'utf8');
-    } catch {
-      // File doesn't exist yet — will be created
-    }
+    } catch {}
     fs.writeFileSync(rcFile, upsertBlock(content, block));
   }
 }
 
-// --- Binary download ---
-
-const PLATFORM_MAP = {
-  'linux-x64': 'sinch-linux-x64',
-  'linux-arm64': 'sinch-linux-arm64',
-  'darwin-x64': 'sinch-darwin-x64',
-  'darwin-arm64': 'sinch-darwin-arm64',
-  'win32-x64': 'sinch-windows-x64.exe',
-  'win32-arm64': 'sinch-windows-x64.exe',
-};
-
-function getTokenFromNpmrc() {
-  // Read GitLab token from global .npmrc (same token used for registry auth)
+function getTokenFromNpmConfig() {
   try {
-    const { execSync } = require('child_process');
-    const globalConfig = execSync('npm config get globalconfig', { encoding: 'utf8' }).trim();
-    const content = fs.readFileSync(globalConfig, 'utf8');
-    const match = content.match(
-      new RegExp(`//gitlab\\.com/api/v4/projects/${PROJECT_ID}/packages/npm/:_authToken=(.+)`)
-    );
-    return match ? match[1].trim() : '';
+    const configPaths = [
+      process.env.npm_config_userconfig,
+      process.env.NPM_CONFIG_USERCONFIG,
+      execSync('npm config get userconfig', { encoding: 'utf8' }).trim(),
+      execSync('npm config get globalconfig', { encoding: 'utf8' }).trim(),
+    ].filter(Boolean);
+
+    for (const configPath of configPaths) {
+      if (!fs.existsSync(configPath)) {
+        continue;
+      }
+
+      const content = fs.readFileSync(configPath, 'utf8');
+      const match = content.match(
+        new RegExp(`//gitlab\\.com/api/v4/projects/${PROJECT_ID}/packages/npm/:_authToken=(.+)`)
+      );
+
+      if (match?.[1]?.trim()) {
+        return match[1].trim();
+      }
+    }
   } catch {
     return '';
   }
+
+  return '';
 }
 
 function downloadFile(url, dest, token) {
   return new Promise((resolve, reject) => {
     const headers = {};
-    if (token) headers['PRIVATE-TOKEN'] = token;
+    if (token) {
+      headers['PRIVATE-TOKEN'] = token;
+    }
 
-    const get = (reqUrl) => {
+    const get = (requestUrl) => {
       https
-        .get(reqUrl, { headers }, (res) => {
-          if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-            get(res.headers.location); // follow redirect
+        .get(requestUrl, { headers }, (response) => {
+          if (
+            response.statusCode >= 300 &&
+            response.statusCode < 400 &&
+            response.headers.location
+          ) {
+            get(response.headers.location);
             return;
           }
-          if (res.statusCode !== 200) {
-            reject(new Error(`Download failed: ${res.statusCode} from ${reqUrl}`));
+
+          if (response.statusCode !== 200) {
+            reject(new Error(`Download failed: ${response.statusCode} from ${requestUrl}`));
             return;
           }
+
           const file = fs.createWriteStream(dest);
-          res.pipe(file);
+          response.pipe(file);
           file.on('finish', () => {
             file.close();
             resolve();
@@ -225,89 +251,46 @@ function downloadFile(url, dest, token) {
         })
         .on('error', reject);
     };
+
     get(url);
   });
 }
 
 async function downloadBinary(version) {
-  const key = `${process.platform}-${process.arch}`;
-  const binName = PLATFORM_MAP[key];
-  if (!binName) return; // unsupported platform — skip silently
+  const binaryInfo = getPlatformBinaryInfo();
+  if (!binaryInfo) {
+    return;
+  }
 
   const pkgRoot = path.join(__dirname, '..');
   const distDir = path.join(pkgRoot, 'dist');
-  const dest = path.join(distDir, binName);
-
-  // Skip if binary already exists (local dev build)
-  if (fs.existsSync(dest)) return;
+  const dest = path.join(distDir, binaryInfo.artifactName);
+  if (fs.existsSync(dest)) {
+    return;
+  }
 
   fs.mkdirSync(distDir, { recursive: true });
-
-  const baseUrl = `https://gitlab.com/api/v4/projects/${PROJECT_ID}/packages/generic/sinch-cli/${version}/${binName}`;
-  const token = process.env.SINCH_GITLAB_TOKEN || process.env.GITLAB_TOKEN || getTokenFromNpmrc();
+  const token =
+    process.env.SINCH_GITLAB_TOKEN || process.env.GITLAB_TOKEN || getTokenFromNpmConfig();
+  const url = `https://gitlab.com/api/v4/projects/${PROJECT_ID}/packages/generic/sinch-cli/${version}/${binaryInfo.artifactName}`;
 
   try {
-    console.log(`Downloading Sinch CLI ${version} for ${key}...`);
-    await downloadFile(baseUrl, dest, token);
-
-    // Make executable on Unix
-    if (process.platform !== 'win32') {
+    await downloadFile(url, dest, token);
+    if (!dest.endsWith('.exe')) {
       fs.chmodSync(dest, 0o755);
     }
-    console.log('Sinch CLI binary downloaded.');
-  } catch (err) {
-    // Clean up partial download
+  } catch (error) {
     try {
-      fs.unlinkSync(dest);
+      fs.rmSync(dest, { force: true });
     } catch {}
-    console.error(`Failed to download Sinch CLI binary: ${err.message}`);
+    console.error(`Failed to download Sinch CLI binary: ${error.message}`);
     console.error(
-      `You can download manually from: https://gitlab.com/sinch/sinch-projects/voice/functions/sinch-cli/-/releases`
+      'You can download the binary manually from GitLab release assets or the generic package registry.'
     );
   }
 }
 
-/**
- * On Windows, npm generates .cmd and .ps1 shims that try to run bin/sinch via
- * /bin/sh (broken on Windows). Replace them with our native .cmd launcher that
- * execs the Bun binary directly — zero Node.js overhead.
- */
-function fixWindowsShims() {
-  if (process.platform !== 'win32') return;
-  try {
-    const prefix = process.env.npm_config_prefix;
-    if (!prefix || !path.isAbsolute(prefix)) return;
-
-    const globalBinDir = prefix;
-    const pkgRoot = path.join(__dirname, '..');
-    const binaryPath = path.join(pkgRoot, 'dist', 'sinch-windows-x64.exe');
-
-    // Write a .cmd that uses the absolute path to the binary inside the npm package.
-    // Can't copy bin/sinch.cmd because %~dp0 would resolve to the global bin dir,
-    // not the package dir where the binary lives.
-    fs.writeFileSync(path.join(globalBinDir, 'sinch.cmd'), `@echo off\r\n"${binaryPath}" %*\r\n`);
-
-    // Remove .ps1 shim (broken — tries /bin/sh) and bash shim (not needed on Windows)
-    try {
-      fs.unlinkSync(path.join(globalBinDir, 'sinch.ps1'));
-    } catch {}
-    try {
-      fs.unlinkSync(path.join(globalBinDir, 'sinch'));
-    } catch {}
-
-    // Clean up orphaned sinch.exe from previous installToGlobalBin versions
-    try {
-      fs.unlinkSync(path.join(globalBinDir, 'sinch.exe'));
-    } catch {}
-  } catch {
-    // Non-fatal — npm's .cmd shim may still work for node-based fallback
-  }
-}
-
-// --- Main ---
-
 async function main() {
-  // Only run on global installs or when forced by setup-dev.js
   if (process.env.npm_config_global !== 'true' && !process.env.SINCH_FORCE_POSTINSTALL) {
     return;
   }
@@ -316,14 +299,7 @@ async function main() {
     fs.mkdirSync(SINCH_DIR, { recursive: true });
 
     const version = getVersion();
-
-    // Download the platform binary
     await downloadBinary(version);
-
-    // Replace npm's broken Windows shims with native .cmd launcher
-    fixWindowsShims();
-
-    // Set up shell completions
     writeCompletionsJson(version);
 
     if (process.platform === 'win32') {
@@ -331,9 +307,14 @@ async function main() {
     } else {
       installBashZshCompletion();
     }
-  } catch {
-    // Silent failure — never break npm install
-  }
+  } catch {}
 }
 
-main();
+if (require.main === module) {
+  main();
+}
+
+module.exports = {
+  stripManagedBlocks,
+  upsertBlock,
+};

package/bin/s

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-// Shorthand alias — same as bin/sinch
-require('./sinch');

package/bin/sinch.cmd

@@ -1,2 +0,0 @@
-@echo off
-"%~dp0..\dist\sinch-windows-x64.exe" %*