@superblocksteam/cli 2.0.3-next.110 → 2.0.3-next.112

package/README.md

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

package/dist/index.js

@@ -15294,12 +15294,12 @@ var require_http = __commonJS({
       }
     };
     exports2.ForbiddenError = ForbiddenError2;
-    var NotFoundError7 = class extends HttpError {
+    var NotFoundError9 = class extends HttpError {
       constructor(message) {
         super(404, message || "Resource not found", "Not found");
       }
     };
-    exports2.NotFoundError = NotFoundError7;
+    exports2.NotFoundError = NotFoundError9;
     var RequestTimedOut = class extends HttpError {
       constructor(message) {
         super(408, message || "Request timed out", "Request timeout");
@@ -82723,13 +82723,13 @@ var require_constants7 = __commonJS({
       }
     };
     exports2.FileAccessError = FileAccessError2;
-    var NotFoundError7 = class extends Error {
+    var NotFoundError9 = class extends Error {
       constructor(message) {
         super(message);
         this.name = "FileNotFoundError";
       }
     };
-    exports2.NotFoundError = NotFoundError7;
+    exports2.NotFoundError = NotFoundError9;
     var BadRequestError2 = class extends Error {
       constructor(message) {
         super(message);
@@ -196476,12 +196476,12 @@ var require_http4 = __commonJS({
       }
     };
     exports2.ForbiddenError = ForbiddenError2;
-    var NotFoundError7 = class extends HttpError {
+    var NotFoundError9 = class extends HttpError {
       constructor(message) {
         super(404, message || "Resource not found", "Not found");
       }
     };
-    exports2.NotFoundError = NotFoundError7;
+    exports2.NotFoundError = NotFoundError9;
     var RequestTimedOut = class extends HttpError {
       constructor(message) {
         super(408, message || "Request timed out", "Request timeout");
@@ -328881,7 +328881,7 @@ var import_dd_trace = __toESM(require_dd_trace2(), 1);
 // ../sdk/package.json
 var package_default = {
   name: "@superblocksteam/sdk",
-  version: "2.0.3-next.110",
+  version: "2.0.3-next.112",
   type: "module",
   description: "Superblocks JS SDK",
   homepage: "https://www.superblocks.com",
@@ -328911,8 +328911,8 @@ var package_default = {
     "@rollup/wasm-node": "^4.35.0",
     "@superblocksteam/bucketeer-sdk": "0.4.1",
     "@superblocksteam/shared": "^0.9081.0",
-    "@superblocksteam/util": "2.0.3-next.110",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.110",
+    "@superblocksteam/util": "2.0.3-next.112",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.112",
     "@vitejs/plugin-react": "^4.3.4",
     axios: "^1.4.0",
     chokidar: "^4.0.3",
@@ -369015,6 +369015,8 @@ async function unwrapResponseDto(request) {
     const errorMessage = response.responseMeta.error?.message ?? response.responseMeta.message ?? `Request failed with status ${response.responseMeta.status}`;
     if (response.responseMeta.status === 409) {
       throw new import_shared17.ConflictError(errorMessage);
+    } else if (response.responseMeta.status === 404) {
+      throw new import_shared16.NotFoundError(errorMessage);
     }
     throw new Error(errorMessage);
   }
@@ -369109,7 +369111,7 @@ var LockService = class extends EventEmitter7 {
         this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
         this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
         await this.shutdown();
-        throw new Error(`Lock is already acquired: ${error}`);
+        throw new Error(`${error}`);
       } else {
         throw new Error(`Error acquiring lock: ${error}`);
       }
@@ -369165,8 +369167,16 @@ var LockService = class extends EventEmitter7 {
           this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
           this.status = LockServiceStatus.LOCK_INVALID;
           await this.shutdown();
+          process.exit(1);
+        } else if (error instanceof import_shared18.NotFoundError) {
+          logger3.error("[lock-service] Lock is not found, shutting down", getErrorMeta(error));
+          this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
+          this.status = LockServiceStatus.LOCK_INVALID;
+          await this.shutdown();
+          process.exit(1);
+        } else {
+          logger3.error("[lock-service] error checking and updating lock", getErrorMeta(error));
         }
-        logger3.error("[lock-service] error checking and updating lock", getErrorMeta(error));
         throw error;
       }
     }
@@ -369179,11 +369189,13 @@ var LockService = class extends EventEmitter7 {
    * This ensures the lock is released
    */
   async shutdown() {
+    const logger3 = getLogger();
     this.stopHeartbeat();
     if (this.isLocked) {
       await this.releaseLock();
     }
     await this.closeRpcClient();
+    logger3.info("[lock-service] shutting down and exiting dev server");
   }
   /**
    * Add a connected user to the lock service.
@@ -369219,12 +369231,13 @@ var LockService = class extends EventEmitter7 {
         this._heartbeatTimeout = setTimeout(() => this.scheduleNextHeartbeat(), this.heartbeatIntervalMs);
       }
     } catch (error) {
-      logger3.error("[lock-service] error sending heartbeat", getErrorMeta(error));
-      this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
-      this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
+      logger3.error("[lock-service] Error sending heartbeat, shutting down", getErrorMeta(error));
+      this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
+      this.status = LockServiceStatus.LOCK_INVALID;
       clearTimeout(this._heartbeatTimeout);
       this._heartbeatTimeout = void 0;
       await this.shutdown();
+      process.exit(1);
     }
   }
   async sendHeartbeat() {
@@ -369937,11 +369950,11 @@ var fileSyncVitePlugin = (pluginParams, options8) => {
       if (lockService) {
         lockService.on("statusChange", (status) => {
           if (status === LockServiceStatus.FAILED_TO_ACQUIRE_LOCK) {
-            sendError(makeServerError(new Error("Lock is already acquired by another user. Please try again later.")));
+            sendError(makeServerError(new Error("Error establishing connection to editing session. Please refresh the page.")));
           } else if (status === LockServiceStatus.LOCK_INVALID) {
-            sendError(makeServerError(new Error("Lock is invalid. Please try again.")));
+            sendError(makeServerError(new Error("Error renewing connection to editing session. Please refresh the page.")));
           } else if (status === LockServiceStatus.LOCK_RELEASED) {
-            sendError(makeServerError(new Error("Lock is released. Please refresh the page or move to local mode.")));
+            sendError(makeServerError(new Error("Editing session is no longer active. Please refresh the page or move to local mode.")));
           } else if (status === LockServiceStatus.RELEASING) {
             socketManager.callEditorClients(async (socket) => {
               try {

package/oclif.manifest.json

@@ -509,5 +509,5 @@
       "strict": true
     }
   },
-  "version": "2.0.3-next.110"
+  "version": "2.0.3-next.112"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "2.0.3-next.110",
+  "version": "2.0.3-next.112",
   "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.3-next.110",
+    "@superblocksteam/sdk": "2.0.3-next.112",
     "@superblocksteam/shared": "^0.9081.0",
-    "@superblocksteam/util": "2.0.3-next.110",
+    "@superblocksteam/util": "2.0.3-next.112",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",