@superblocksteam/sdk 2.0.6-next.49 → 2.0.6-next.5

package/src/cli-replacement/dev.mts

@@ -1,6 +1,7 @@
 import "../dev-utils/dev-tracer.js";
 
 import * as child_process from "node:child_process";
+import * as fsp from "node:fs/promises";
 import path from "node:path";
 import { promisify } from "node:util";
 import { maskUnixSignals } from "@superblocksteam/util";
@@ -17,7 +18,7 @@ import fs from "fs-extra";
 import { resolveCommand } from "package-manager-detector";
 import { detect } from "package-manager-detector/detect";
 
-import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
+import { getLogger } from "../dev-utils/dev-logger.mjs";
 import { createDevServer } from "../dev-utils/dev-server.mjs";
 import tracer from "../dev-utils/dev-tracer.js";
 import { SuperblocksSdk } from "../sdk.js";
@@ -26,7 +27,6 @@ import {
   getCurrentCliVersion,
   getCurrentLibraryVersionWithoutPM,
 } from "./automatic-upgrades.js";
-import { AUTO_UPGRADE_EXIT_CODE } from "./automatic-upgrades.js";
 import type { DevLogger } from "../dev-utils/dev-logger.mjs";
 import type { ApplicationConfig } from "../types/common.js";
 import type { DraftInterface } from "@superblocksteam/vite-plugin-file-sync/draft-interface";
@@ -93,6 +93,7 @@ async function installPackages(cwd: string, logger: DevLogger) {
 export async function dev(options: {
   /* cwd is required */
   cwd: string;
+  pidfilePath?: string;
   devServerPort?: number;
 
   /* user control of sync operations */
@@ -106,7 +107,7 @@ export async function dev(options: {
   /* For debugging purposes to get location of the cli */
   superblocksPath?: string;
   /* For redirecting output, like when running outside of the CLI */
-  logger?: (...messages: (string | Error)[]) => void;
+  logger?: (message: string) => void;
 
   /* For a child process when restarting the dev server for automatic upgrades */
   skipAutoUpgrade?: boolean;
@@ -118,6 +119,7 @@ export async function dev(options: {
 
   const {
     cwd,
+    pidfilePath,
     devServerPort,
     downloadFirst,
     uploadFirst,
@@ -126,6 +128,12 @@ export async function dev(options: {
     skipAutoUpgrade,
   } = options;
 
+  const cliVersion = await getCurrentCliVersion();
+  const libraryVersion = await getCurrentLibraryVersionWithoutPM();
+  logger.info(
+    `Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion}, libraryVersion: ${libraryVersion?.alias} ${libraryVersion?.version}`,
+  );
+
   // Add check for node_modules
   if (!fs.existsSync(path.join(cwd, "node_modules"))) {
     throw new Error(
@@ -133,13 +141,9 @@ export async function dev(options: {
     );
   }
 
-  logger.info("Starting dev server");
-
-  const cliVersion = await getCurrentCliVersion();
-  const libraryVersion = await getCurrentLibraryVersionWithoutPM();
-  logger.info(
-    `Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion}, libraryVersion: ${libraryVersion?.alias} ${libraryVersion?.version}`,
-  );
+  if (pidfilePath) {
+    await fsp.writeFile(pidfilePath, `${process.pid}\n`);
+  }
 
   const port = devServerPort ?? 5173;
 
@@ -184,11 +188,17 @@ export async function dev(options: {
         if (lockService) {
           try {
             await lockService!.acquireLock();
+
+            // TODO(code-mode): package naming is preventing upgrade in ephemeral environments
+            if (
+              !process.env.PACKAGE_SUFFIX ||
+              process.env.PACKAGE_SUFFIX === "" ||
+              !skipAutoUpgrade
+            ) {
+              await checkVersionsAndUpgrade(lockService, applicationConfig);
+            }
           } catch (error) {
-            logger.error(
-              "Failed to acquire lock on application",
-              getErrorMeta(error),
-            );
+            logger.error("Failed to acquire lock on application", error);
             passErrorToVSCode(
               (error as { context?: { message: string } }).context?.message,
               logger,
@@ -222,10 +232,11 @@ export async function dev(options: {
 
         if (isSynced) {
           logger.info("Local files are in sync with the server");
-        } else {
-          logger.info("Local files are out of sync with the server");
+          return;
         }
 
+        logger.info("Local files are out of sync with the server");
+
         if (!(downloadFirst || uploadFirst)) {
           throw new Error(
             "You must choose --download-first or --upload-first to use the dev command",
@@ -235,70 +246,37 @@ export async function dev(options: {
           throw new Error("Choose either --download-first or --upload-first");
         }
 
-        let hasPackageChanged = false;
-
         if (downloadFirst) {
-          logger.info("Starting download");
+          logger.info(
+            "Starting directory sync from server before starting the local server",
+          );
 
+          // Read package.json before download
           const packageJsonBefore = await readPkgJson(cwd);
+
           await syncService!.downloadDirectory();
+
+          // Read package.json after download and compare
           const packageJsonAfter = await readPkgJson(cwd);
 
+          // Check if package.json changed
           if (packageJsonBefore && packageJsonAfter) {
             const diff = diffJson(packageJsonBefore, packageJsonAfter);
-            hasPackageChanged = diff.some((part) => part.added || part.removed);
-          } else if (packageJsonAfter) {
-            hasPackageChanged = true;
-            logger.info("package.json was created, installing packages…");
-          }
-        }
+            const hasChanges = diff.some((part) => part.added || part.removed);
 
-        let hasCliUpdated = false;
-        if (
-          !process.env.PACKAGE_SUFFIX ||
-          process.env.PACKAGE_SUFFIX === "" ||
-          !skipAutoUpgrade
-        ) {
-          if (lockService) {
-            const result = await checkVersionsAndUpgrade(
-              lockService,
-              applicationConfig,
-            );
-            if (result?.libraryUpdated) {
-              hasPackageChanged = true;
+            if (hasChanges) {
+              logger.info("package.json has changed, installing packages…");
+              await installPackages(cwd, logger);
             }
-            hasCliUpdated = result?.cliUpdated ?? false;
-          } else {
-            logger.warn(
-              "Lock service is not available, skipping version check and upgrade",
-            );
           }
-        }
-
-        if (hasPackageChanged) {
-          logger.info("Installing packages…");
-          await installPackages(cwd, logger);
-        }
-
-        if (hasPackageChanged || uploadFirst) {
+        } else if (uploadFirst) {
           logger.info("Uploading local files to server before starting");
           await syncService!.uploadDirectory();
-          await syncService!.uploadDirectoryNowIfNeeded();
-        }
-
-        if (hasCliUpdated) {
-          logger.info("CLI was updated, restarting the dev server…");
-          process.exit(AUTO_UPGRADE_EXIT_CODE);
         }
       });
     } catch (error: any) {
       logger.error(error.message);
-      try {
-        await lockService?.shutdownAndExit();
-      } finally {
-        // this is redundant, but it's here to make sure the lock service is shutdown and the process exits
-        process.exit(1);
-      }
+      process.exit(1);
     }
   } else {
     logger.info("Skipping directory sync");
@@ -318,10 +296,6 @@ export async function dev(options: {
   options.signal?.addEventListener("abort", () => {
     logger.info("Server closed");
     httpServer.close();
-    lockService?.shutdownAndExit().catch(() => {
-      // this is redundant, but it's here to make sure the lock service is shutdown and the process exits
-      process.exit(1);
-    });
   });
 
   logger.debug(green(`Local server started at port ${port}`));

package/src/dev-utils/dev-logger.mts

@@ -1,113 +1,39 @@
 import { createLogger, format, transports } from "winston";
-import type winston from "winston";
 
-const activeTransports: winston.transport[] = [];
-
-if (process.env.SUPERBLOCKS_IS_CSB === "true") {
-  activeTransports.push(
-    new transports.File({
-      format: format.json(),
-      filename: `/tmp/dev-server.log`,
-      level: "info",
-    }),
-  );
-}
-
-activeTransports.push(
-  new transports.Console({
-    format: format.combine(
-      format.colorize(),
-      format.timestamp({
-        format: "HH:mm:ss.SSS",
-      }),
-      format.printf((props) => {
-        const { message, timestamp, error, level } = props;
-        const base =
-          process.env.SUPERBLOCKS_IS_CSB === "true"
-            ? `${timestamp} ${message}`
-            : `${message}`;
-        if (level === "error") {
-          return `${base} ${(error as ErrorMeta["error"]).message} ${(error as ErrorMeta["error"]).stack}`;
-        }
-        return base;
-      }),
-    ),
-  }),
-);
+export type DevLogger = {
+  debug: (message: string, ...meta: any[]) => void;
+  info: (message: string, ...meta: any[]) => void;
+  warn: (message: string, ...meta: any[]) => void;
+  error: (message: string, ...meta: any[]) => void;
+};
 
 const winstonLogger = createLogger({
-  level: "debug",
+  level: "info",
   exitOnError: false,
   format: format.json(),
-  transports: activeTransports,
-});
-
-interface ErrorMeta {
-  error: {
-    kind: string;
-    message: string;
-    stack?: string;
-  };
-}
-
-export interface DevLogger {
-  log: (...messages: string[]) => void;
-  debug: (...messages: string[]) => void;
-  info: (...messages: string[]) => void;
-  warn: (...messages: string[]) => void;
-  error: (message: string, meta?: ErrorMeta) => void;
-}
-const logger: DevLogger = Object.freeze({
-  debug: (...messages: string[]) =>
-    winstonLogger.debug(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  log: (...messages: string[]) =>
-    winstonLogger.info(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  info: (...messages: string[]) =>
-    winstonLogger.info(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  warn: (...messages: string[]) =>
-    winstonLogger.warn(
-      messages.length > 0 ? messages.join(" ") : (messages[0] as string),
-    ),
-  error: (message: string, meta?: ErrorMeta) =>
-    winstonLogger.error(message, meta),
+  transports: [
+    new transports.File({ filename: `/tmp/dev-server.log`, level: "info" }),
+    new transports.Console({
+      format: format.combine(
+        format.printf(({ message }) => `${message}`),
+        format.colorize({ message: true }),
+      ),
+      level: "debug",
+    }),
+  ],
 });
 
 export function getLogger(
-  loggerOverride?: (...messages: string[]) => void,
+  loggerOverride?: (message: string) => void,
 ): DevLogger {
   if (!loggerOverride) {
-    return logger;
+    return winstonLogger;
   }
 
   return {
     debug: loggerOverride,
     info: loggerOverride,
     warn: loggerOverride,
-    log: loggerOverride,
-    error: loggerOverride as any,
-  };
-}
-
-export function getErrorMeta(error: unknown): ErrorMeta {
-  if (error instanceof Error) {
-    return {
-      error: {
-        kind: error.name,
-        message: error.message,
-        stack: error.stack,
-      },
-    };
-  }
-  return {
-    error: {
-      kind: "Unknown Error",
-      message: JSON.stringify(error),
-    },
+    error: loggerOverride,
   };
 }

package/src/dev-utils/dev-server.mts

@@ -18,8 +18,7 @@ import {
   customComponentsPlugin,
   isCustomComponentsEnabled,
 } from "./custom-build.mjs";
-import { getErrorMeta, getLogger } from "./dev-logger.mjs";
-import { buildManifestStubPlugin } from "./vite-plugin-build-manifest-stub.mjs";
+import { getLogger } from "./dev-logger.mjs";
 import { ddRumPlugin } from "./vite-plugin-dd-rum.mjs";
 import { superblocksCdnPlugin } from "./vite-plugin-sb-cdn.mjs";
 import type { AiService } from "@superblocksteam/vite-plugin-file-sync/ai-service";
@@ -188,6 +187,13 @@ export async function createDevServer({
     }, viteReject);
   });
 
+  // TODO(code-mode): remove this soon
+  app.get("/_sb_disconnect", async (_req, res) => {
+    console.log("GET /_sb_disconnect");
+    // TODO(code-mode): should this include any validation checks, such as getting a token?
+    await gracefulShutdown({ logger, serverInitiated: false });
+    res.send("ok");
+  });
   app.post("/_sb_disconnect", async (req, res) => {
     const { initiatedByEmail, switchingTo } = req.body;
     // TODO(code-mode): should this include any validation checks, such as getting a token?
@@ -200,7 +206,7 @@ export async function createDevServer({
       });
       res.send("ok");
     } catch (e) {
-      logger.error("Error disconnecting from dev server", getErrorMeta(e));
+      console.error("Error disconnecting from dev server", e);
       res.status(500).send("Error disconnecting from dev server");
     }
   });
@@ -254,7 +260,7 @@ async function startVite({
 }) {
   const viteLogger = createLogger();
   const logger = getLogger(loggerOverride);
-  viteLogger.info = (msg: string) => logger.info(msg);
+  viteLogger.info = logger.info;
   viteLogger.warn = (msg: string) => {
     logger.warn(yellow(msg));
   };
@@ -270,8 +276,6 @@ async function startVite({
   const isCustomBuildEnabled = await isCustomComponentsEnabled();
   const customFolder = path.join(root, "custom");
 
-  const draftsFolder = path.join(root, ".superblocks");
-
   const cdnUrl = process.env.SUPERBLOCKS_CDN_URL ?? "http://localhost:4040/cdn";
 
   const env = loadEnv(mode, root, "");
@@ -309,7 +313,7 @@ async function startVite({
     server: {
       middlewareMode: true,
       watch: {
-        ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
+        ignored: [`${customFolder}/**/*`],
       },
       hmr: hmrOptions,
       cors: {
@@ -338,13 +342,11 @@ async function startVite({
           aiService,
           httpServer,
           tracer,
+          logger,
         },
         { isCustomBuildEnabled },
       ) as Plugin,
 
-      // Add a virtual "stub" module for the build manifest
-      buildManifestStubPlugin(),
-
       // for now, only use the CDN locally
       superblocksCdnPlugin({
         imports: {

package/src/dev-utils/vite-plugin-sb-cdn.mts

@@ -224,8 +224,8 @@ async function analyzeModuleGraph(
     { content: string; binary: ArrayBuffer }
   > = new Map(),
 ): Promise<AnalysisResult> {
-  // Avoid circular dependencies and skip the shared library's build manifest reference
-  if (visited.has(url) || url.endsWith("/user-facing/build-manifest.js")) {
+  // Avoid circular dependencies
+  if (visited.has(url)) {
     return {
       dependencies: new Set(),
       content: "",
@@ -474,13 +474,6 @@ const wellKnownPackages = new Map<string, string>([
   ["react-dom", "https://esm.sh/react-dom@18.2.0"],
   ["react/jsx-runtime", "https://esm.sh/react@18.2.0/jsx-runtime"],
   ["react/jsx-dev-runtime", "https://esm.sh/react@18.2.0/jsx-dev-runtime"],
-  ["./user-facing/build-manifest.js", "/assets/build-manifest.js"],
-  ["/assets/user-facing/build-manifest.js", "/assets/build-manifest.js"],
-]);
-
-const packagesToExcludeFromCdnRedirect = new Set<string>([
-  "./user-facing/build-manifest.js",
-  "/assets/user-facing/build-manifest.js",
 ]);
 
 const react18CdnUrl = "https://esm.sh/react@18.2.0";
@@ -780,12 +773,8 @@ export async function superblocksCdnPlugin(
         // Externalize modules specified in the import map
         // The cdn: prefix ensures they're properly resolved to the CDN URL
         if (imports.includes(id)) {
-          const shouldRedirectToCdn = !packagesToExcludeFromCdnRedirect.has(id);
           debug(`Externalizing module for CDN resolution: ${id}`);
-          return {
-            id: `${shouldRedirectToCdn ? "cdn:" : ""}${id}`,
-            external: true,
-          };
+          return { id: `cdn:${id}`, external: true };
         }
 
         return null;

package/src/vite-plugin-inject-sb-ids-transform.mts

@@ -29,7 +29,7 @@ const routesFileBaseName = "routes.json";
 export async function injectSuperblocksIdsPlugin(root: string) {
   const viteLogger = createLogger();
   const logger = getLogger();
-  viteLogger.info = (msg: string) => logger.info(msg);
+  viteLogger.info = logger.info;
   viteLogger.warn = (msg: string) => {
     logger.warn(yellow(msg));
   };