@superblocksteam/cli 2.0.0-next.111 → 2.0.0-next.113

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/2.0.0-next.111 linux-x64 node-v20.19.0
+@superblocksteam/cli/2.0.0-next.113 linux-x64 node-v20.19.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/dist/index.js

@@ -302617,7 +302617,7 @@ var LockService = class extends EventEmitter5 {
         logger3.error(`[lock-service] ${error.message}`);
         this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
         this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
-        await this.shutdown();
+        await this.shutdown({ serverInitiated: false });
         throw new Error(`${error}`);
       } else {
         throw new Error(`${error}. Please try again later.`);
@@ -302688,15 +302688,18 @@ var LockService = class extends EventEmitter5 {
    * Cleanup method to be called when the class is destroyed
    * This ensures the lock is released
    */
-  async shutdown() {
+  async shutdown({ serverInitiated, switchingTo, initiatedByEmail }) {
     const logger3 = getLogger();
+    if (serverInitiated) {
+      this.emit("closedByServer", { initiatedByEmail, switchingTo });
+    }
     if (this.syncCallback && this.isLocked) {
       await this.syncCallback();
     } else {
       logger3.info("[lock-service] no sync callback because lock is not valid anymore");
     }
     this.stopHeartbeat();
-    if (this.isLocked) {
+    if (this.isLocked && !serverInitiated) {
       await this.releaseLock();
     }
     await this.closeRpcClient();
@@ -302706,7 +302709,7 @@ var LockService = class extends EventEmitter5 {
    * Shutdown the lock service and exit the dev server
    */
   async shutdownAndExit() {
-    await this.shutdown();
+    await this.shutdown({ serverInitiated: false });
     process.exit(1);
   }
   /**
@@ -314409,6 +314412,15 @@ var fileSyncVitePlugin = (pluginParams, options8) => {
             });
           }
         });
+        lockService.on("closedByServer", (data) => {
+          socketManager.callEditorClients(async (socket) => {
+            try {
+              await socket.call.closedByServer(data);
+            } catch (err) {
+              logger3.error("Failed to send releasingLock", getErrorMeta(err));
+            }
+          });
+        });
       }
       fileSyncManager.on("routesChanged", () => {
         const rootId = normalizePath5(path28.join(config.root, "root.tsx"));
@@ -318326,7 +318338,7 @@ var import_util29 = __toESM(require_dist3(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.0-next.111",
+  version: "2.0.0-next.113",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -318368,8 +318380,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.5.0",
     "@superblocksteam/shared": "0.9149.0",
-    "@superblocksteam/util": "2.0.0-next.111",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.111",
+    "@superblocksteam/util": "2.0.0-next.113",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.0-next.113",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -325201,11 +325213,13 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
     viteResolve = resolve8;
     viteReject = reject;
   });
-  async function gracefulShutdown(logger4) {
+  async function gracefulShutdown({ logger: logger4, serverInitiated, switchingTo, initiatedByEmail }) {
     try {
-      if (lockService?.isLocked) {
-        await lockService.shutdown();
-      }
+      await lockService?.shutdown({
+        serverInitiated,
+        switchingTo,
+        initiatedByEmail
+      });
       if (viteServer) {
         await viteServer?.close();
         viteServer = null;
@@ -325229,6 +325243,7 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
     origin: true,
     credentials: true
   }));
+  app.use(import_express.default.json());
   app.use((req, res, next) => {
     res.setHeader("Cache-Control", "no-store, max-age=0");
     if (req.url === "/_sb_connect" || req.url === "/_sb_disconnect" || req.url === "/_sb_health" || req.url === "/_sb_status") {
@@ -325271,7 +325286,18 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
     }, viteReject);
   });
   app.get("/_sb_disconnect", async (_req, res) => {
-    await gracefulShutdown(logger3);
+    console.log("GET /_sb_disconnect");
+    await gracefulShutdown({ logger: logger3, serverInitiated: false });
+    res.send("ok");
+  });
+  app.post("/_sb_disconnect", async (req, res) => {
+    const { initiatedByEmail, switchingTo } = req.body;
+    await gracefulShutdown({
+      logger: logger3,
+      serverInitiated: true,
+      switchingTo,
+      initiatedByEmail
+    });
     res.send("ok");
   });
   app.get("/_sb_status", async (_req, res) => {
@@ -325288,15 +325314,15 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
   });
   process.on("SIGINT", async () => {
     logger3.info("SIGINT received");
-    await gracefulShutdown(logger3);
+    await gracefulShutdown({ logger: logger3, serverInitiated: false });
   });
   process.on("SIGTERM", async () => {
     logger3.info("SIGTERM received");
-    await gracefulShutdown(logger3);
+    await gracefulShutdown({ logger: logger3, serverInitiated: false });
   });
   process.on("SIGABRT", async () => {
     logger3.info("SIGABRT received");
-    await gracefulShutdown(logger3);
+    await gracefulShutdown({ logger: logger3, serverInitiated: false });
   });
   httpServer = await app.listen(port);
   return httpServer;
@@ -325318,7 +325344,7 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, port
   };
   const isCustomBuildEnabled2 = await isCustomComponentsEnabled();
   const customFolder = path34.join(root2, "custom");
-  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.111";
+  const cdnUrl = "https://assets-cdn.superblocks.com/library/2.0.0-next.113";
   const env3 = loadEnv(mode, root2, "");
   const hmrPort = await getFreePort();
   const hmrOptions = {
@@ -325901,7 +325927,9 @@ async function checkVersionsAndUpgrade(lockService, config2) {
     libraryNeedsUpgrade = targetVersions.library && (0, import_gt.default)(targetVersions.library, currentLibraryInfo.version);
   } catch (error) {
     console.warn("Error checking versions to upgrade, releasing lock and exiting", error);
-    await lockService.shutdown();
+    await lockService.shutdown({
+      serverInitiated: false
+    });
     process.exit(1);
   }
   if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {

package/oclif.manifest.json

@@ -571,5 +571,5 @@
       "strict": true
     }
   },
-  "version": "2.0.0-next.111"
+  "version": "2.0.0-next.113"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.0-next.111",
+  "version": "2.0.0-next.113",
   "type": "module",
   "description": "Official Superblocks CLI",
   "homepage": "https://www.superblocks.com",
@@ -42,9 +42,9 @@
   "devDependencies": {
     "@eslint/js": "^9.16.0",
     "@oclif/test": "^4.1.11",
-    "@superblocksteam/sdk": "2.0.0-next.111",
+    "@superblocksteam/sdk": "2.0.0-next.113",
     "@superblocksteam/shared": "0.9149.0",
-    "@superblocksteam/util": "2.0.0-next.111",
+    "@superblocksteam/util": "2.0.0-next.113",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",