@superblocksteam/sdk 2.0.83-next.1 → 2.0.83

package/dist/telemetry/util.js

@@ -1,34 +1,11 @@
 import { getLocalTokenWithUrl } from "@superblocksteam/util";
 export const SERVICE_NAME = "sdk-dev-server";
-/**
- * Get the OTLP base URL for telemetry export.
- *
- * Priority:
- * 1. SUPERBLOCKS_OTEL_COLLECTOR_URL env var (for local obs mode)
- * 2. Superblocks API endpoint derived from base URL
- *
- * When SUPERBLOCKS_OTEL_COLLECTOR_URL is set (e.g., http://localhost:24318),
- * telemetry is sent directly to the local OTEL collector.
- *
- * Note: This returns the BASE URL. The telemetry library appends /v1/traces,
- * /v1/metrics, /v1/logs to this URL.
- */
-function getOtlpBaseUrl(superblocksBaseUrl) {
-    const localOtelUrl = process.env.SUPERBLOCKS_OTEL_COLLECTOR_URL;
-    if (localOtelUrl) {
-        // Remove trailing /v1/traces etc. if present (just use base URL)
-        return localOtelUrl.replace(/\/v1\/(traces|metrics|logs)$/, "");
-    }
-    // Default: Superblocks API proxies OTLP requests
-    // The server expects /api/v1/traces but the telemetry lib adds /v1/traces,
-    // so we return /api and let telemetry lib append /v1/traces
-    return superblocksBaseUrl.origin + "/api";
-}
 export async function getConfiguration() {
     try {
         const tokenWithUrl = await getLocalTokenWithUrl();
         const superblocksBaseUrl = new URL(tokenWithUrl.superblocksBaseUrl);
-        const otlpBaseUrl = getOtlpBaseUrl(superblocksBaseUrl);
+        const superblocksTracesUrl = superblocksBaseUrl.origin + "/api/v1/traces";
+        const superblocksLogsUrl = superblocksBaseUrl.origin + "/api/v1/logs";
         const superblocksHostname = superblocksBaseUrl.hostname;
         let token = "";
         if ("token" in tokenWithUrl) {
@@ -36,7 +13,8 @@ export async function getConfiguration() {
         }
         return {
             superblocksBaseUrl,
-            otlpBaseUrl,
+            superblocksTracesUrl,
+            superblocksLogsUrl,
             superblocksHostname,
             serviceName: SERVICE_NAME,
             token,

package/dist/telemetry/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/telemetry/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAE7C;;;;;;;;;;;;GAYG;AACH,SAAS,cAAc,CAAC,kBAAuB;IAC7C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;IAChE,IAAI,YAAY,EAAE,CAAC;QACjB,iEAAiE;QACjE,OAAO,YAAY,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,iDAAiD;IACjD,2EAA2E;IAC3E,4DAA4D;IAC5D,OAAO,kBAAkB,CAAC,MAAM,GAAG,MAAM,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAClD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACvD,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,QAAQ,CAAC;QACxD,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;YAC5B,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO;YACL,kBAAkB;YAClB,WAAW;YACX,mBAAmB;YACnB,WAAW,EAAE,YAAY;YACzB,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CACX,4FAA4F,EAC5F,CAAC,CACF,CAAC;QACF,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/telemetry/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAClD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;QACpE,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,MAAM,GAAG,gBAAgB,CAAC;QAC1E,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,GAAG,cAAc,CAAC;QACtE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,QAAQ,CAAC;QACxD,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;YAC5B,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO;YACL,kBAAkB;YAClB,oBAAoB;YACpB,kBAAkB;YAClB,mBAAmB;YACnB,WAAW,EAAE,YAAY;YACzB,KAAK;SACN,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CACX,4FAA4F,EAC5F,CAAC,CACF,CAAC;QACF,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.83-next.1",
+  "version": "2.0.83",
   "type": "module",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
@@ -53,11 +53,10 @@
     "vite-tsconfig-paths": "^6.0.4",
     "winston": "^3.17.0",
     "yaml": "^2.7.1",
-    "@superblocksteam/library-shared": "2.0.83-next.1",
-    "@superblocksteam/shared": "0.9563.0",
-    "@superblocksteam/telemetry": "2.0.83-next.1",
-    "@superblocksteam/util": "2.0.83-next.1",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.83-next.1"
+    "@superblocksteam/library-shared": "2.0.83",
+    "@superblocksteam/shared": "0.9562.5",
+    "@superblocksteam/util": "2.0.83",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.83"
   },
   "optionalDependencies": {
     "@rollup/rollup-darwin-arm64": "^4.34.9",

package/src/cli-replacement/automatic-upgrades.ts

@@ -10,10 +10,6 @@ import gt from "semver/functions/gt.js";
 import valid from "semver/functions/valid.js";
 import { getTracer } from "../telemetry/index.js";
 import { getErrorMeta, getLogger } from "../telemetry/logging.js";
-import {
-  getCurrentCliVersion,
-  clearCliVersionCache,
-} from "./version-detection.js";
 import type { ResponseMeta } from "../socket/handlers.js";
 import type { ApplicationConfigWithTokenConfigAndUserInfo } from "../types/common.js";
 import type { LockService } from "@superblocksteam/vite-plugin-file-sync/lock-service";
@@ -28,6 +24,11 @@ interface Versions {
   [pkg: string]: string;
 }
 
+interface PackageVersionInfo {
+  version: string;
+  alias?: string;
+}
+
 interface CheckVersionsErrorResponse {
   responseMeta: ResponseMeta;
 }
@@ -72,6 +73,43 @@ async function getRemoteVersions(
   }
 }
 
+export async function getCurrentCliVersion(): Promise<
+  PackageVersionInfo | undefined
+> {
+  try {
+    const command = process.platform === "win32" ? "where" : "which";
+    const { stdout } = await exec(`${command} superblocks`);
+    const superblocksPath = stdout.trim();
+
+    if (!superblocksPath) return undefined;
+
+    const { stdout: versionOutput } = await exec(
+      `${superblocksPath} version --json`,
+    );
+    const json = JSON.parse(versionOutput) as Record<string, string>;
+    // Extract version from string like "@superblocksteam/cli/2.0.0-next.1" or "@superblocksteam/cli-ephemeral/2.0.0-SNAPSHOT.ebd2b86d643331f5"
+    const version = json.cliVersion?.replace(
+      /@superblocksteam\/cli(-ephemeral)?\//,
+      "",
+    );
+
+    const aliasMatch = json.cliVersion?.match(/@superblocksteam\/([^\/]+)/);
+    if (aliasMatch && aliasMatch[1] !== "cli") {
+      return {
+        version: version,
+        alias: `@superblocksteam/${aliasMatch[1]}`,
+      };
+    }
+
+    return { version };
+  } catch (error) {
+    if (isNativeError(error)) {
+      logger.error(`Error getting CLI version: ${error.message}`);
+    }
+    return undefined;
+  }
+}
+
 async function upgradeCliWithOclif(targetVersion: string): Promise<boolean> {
   try {
     const command = process.platform === "win32" ? "where" : "which";
@@ -147,9 +185,6 @@ async function upgradeCliWithPackageManager(
   // Wait for the install to complete, then validate the version
   await promise;
 
-  // Clear cache to force actual version detection (not just returning cached value)
-  clearCliVersionCache();
-
   const currentCliInfo = await getCurrentCliVersion();
   if (!currentCliInfo) {
     throw new Error("Could not get validate CLI version post-install");
@@ -161,9 +196,6 @@ async function upgradeCliWithPackageManager(
     );
   }
 
-  // Now that we've validated, cache the correct version (avoids re-detection on next call)
-  clearCliVersionCache({ version: targetVersion, alias });
-
   // This log line is used to end the upgrade spinner
   logger.info(`Successfully upgraded packages to ${targetVersion}`);
 }