@sanvika/cloudinary 0.3.1 → 0.3.2

package/dist/index.js

@@ -108,20 +108,35 @@ var TRANSFORM_PRESETS = {
   responsive: { w: "auto", dpr: "auto", q: "auto", f: "auto" }
 };
 
+// src/cloudinaryEnv.js
+function resolveCloudinaryClientSecret() {
+  return (process.env.CLOUDINARY_CLIENT_SECRET || process.env.CLOUDINARY_TOKEN || "").trim();
+}
+function resolveCloudinaryClientId() {
+  return (process.env.CLOUDINARY_CLIENT_ID || process.env.CLOUDINARY_APP_NAME || process.env.PROJECT_NAME || process.env.NEXT_PUBLIC_PROJECT_NAME || "").trim();
+}
+function resolveCloudinaryGatewayUrl() {
+  const url = (process.env.CLOUDINARY_GATEWAY_URL || "https://cloudinary.sanvikaproduction.com").trim().replace(/\/+$/, "");
+  return url || "https://cloudinary.sanvikaproduction.com";
+}
+function isCloudinaryProxyConfigured() {
+  return Boolean(resolveCloudinaryGatewayUrl() && resolveCloudinaryClientSecret());
+}
+
 // src/gatewayClient.js
 function isProxyMode() {
-  return Boolean(process.env.CLOUDINARY_GATEWAY_URL && process.env.CLOUDINARY_TOKEN);
+  return isCloudinaryProxyConfigured();
 }
 function requireProxyEnv() {
-  const base = process.env.CLOUDINARY_GATEWAY_URL;
-  const token = process.env.CLOUDINARY_TOKEN;
+  const base = resolveCloudinaryGatewayUrl();
+  const token = resolveCloudinaryClientSecret();
   if (!base || !token) {
     throw new CloudinaryError(
-      "Proxy gateway env missing. Set CLOUDINARY_GATEWAY_URL and CLOUDINARY_TOKEN.",
+      "Proxy gateway env missing. Set CLOUDINARY_GATEWAY_URL and CLOUDINARY_CLIENT_SECRET.",
       "gateway_env"
     );
   }
-  return { base: base.replace(/\/+$/, ""), token };
+  return { base, token };
 }
 async function handleResponse(operation, res) {
   let body = null;
@@ -195,12 +210,12 @@ async function loadLegacyCloudinary() {
     return _cloudinary;
   } catch (err) {
     throw new Error(
-      "@sanvika/cloudinary: legacy direct mode requires the 'cloudinary' npm package to be installed. Either install it (pnpm add cloudinary) OR (recommended) use gateway mode by setting CLOUDINARY_GATEWAY_URL + CLOUDINARY_TOKEN. Original error: " + err.message
+      "@sanvika/cloudinary: legacy direct mode requires the 'cloudinary' npm package to be installed. Either install it (pnpm add cloudinary) OR (recommended) use gateway mode by setting CLOUDINARY_GATEWAY_URL + CLOUDINARY_CLIENT_SECRET. Original error: " + err.message
     );
   }
 }
 async function configureSanvikaCloudinary({ appName, cloudName, apiKey, apiSecret } = {}) {
-  const resolvedApp = appName || process.env.CLOUDINARY_APP_NAME;
+  const resolvedApp = appName || resolveCloudinaryClientId();
   if (!resolvedApp) throw new Error("appName is required for configureSanvikaCloudinary");
   _appName = resolvedApp;
   if (isProxyMode()) {
@@ -212,7 +227,7 @@ async function configureSanvikaCloudinary({ appName, cloudName, apiKey, apiSecre
   const as = apiSecret || process.env.CLOUDINARY_API_SECRET;
   if (!cn || !ak || !as) {
     throw new Error(
-      "Cloudinary credentials missing. Either use proxy mode (CLOUDINARY_GATEWAY_URL + CLOUDINARY_TOKEN) or legacy env (CLOUDINARY_CLOUD_NAME, CLOUDINARY_API_KEY, CLOUDINARY_API_SECRET)."
+      "Cloudinary credentials missing. Either use proxy mode (CLOUDINARY_GATEWAY_URL + CLOUDINARY_CLIENT_SECRET) or legacy env (CLOUDINARY_CLOUD_NAME, CLOUDINARY_API_KEY, CLOUDINARY_API_SECRET)."
     );
   }
   const cloudinary = await loadLegacyCloudinary();
@@ -222,12 +237,12 @@ async function configureSanvikaCloudinary({ appName, cloudName, apiKey, apiSecre
 async function ensureConfigured() {
   if (_configured) return;
   if (isProxyMode()) {
-    _appName = _appName || process.env.CLOUDINARY_APP_NAME || "sanvika-app";
+    _appName = _appName || resolveCloudinaryClientId() || "sanvika-app";
     _configured = true;
     return;
   }
-  if (process.env.CLOUDINARY_APP_NAME) {
-    await configureSanvikaCloudinary({ appName: process.env.CLOUDINARY_APP_NAME });
+  if (resolveCloudinaryClientId()) {
+    await configureSanvikaCloudinary({ appName: resolveCloudinaryClientId() });
     return;
   }
   throw new Error("Call configureSanvikaCloudinary({ appName }) before using SDK operations.");
@@ -543,7 +558,7 @@ function verifySanvikaWebhookSignature({ headers, rawBody, secret, toleranceSec
   };
   const sig = String(getHeader("x-sanvika-signature") || "").trim();
   const ts = String(getHeader("x-sanvika-timestamp") || "").trim();
-  const token = secret || process.env.CLOUDINARY_TOKEN;
+  const token = secret || resolveCloudinaryClientSecret();
   if (!token) return { valid: false, reason: "missing_secret" };
   if (!sig) return { valid: false, reason: "missing_signature" };
   if (!ts) return { valid: false, reason: "missing_timestamp" };
@@ -667,12 +682,16 @@ export {
   getCloudinaryUsage,
   getFolderPath,
   getOptimizedUrl,
+  isCloudinaryProxyConfigured,
   isCloudinaryUrl,
   isProxyMode,
   isRetriableError,
   normalizeFolderPath,
   pingCloudinary,
   renameImage,
+  resolveCloudinaryClientId,
+  resolveCloudinaryClientSecret,
+  resolveCloudinaryGatewayUrl,
   runCloudinaryDiagnostics,
   splitFileName,
   testCloudinaryWebhookSignature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanvika/cloudinary",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Centralized Cloudinary SDK for the Sanvika ecosystem — proxy gateway mode (zero credentials). Legacy direct mode requires consumer to install 'cloudinary' npm package (not recommended).",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,6 +12,10 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "tsup",
+    "prepublishOnly": "npm run build"
+  },
   "devDependencies": {
     "tsup": "^8.5.1"
   },
@@ -48,8 +52,5 @@
     "type": "git",
     "url": "https://github.com/sanvikaproduction/sanvika-cloudinary",
     "directory": "packages/sanvika-cloudinary-sdk"
-  },
-  "scripts": {
-    "build": "tsup"
   }
-}
+}