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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -14,7 +14,7 @@ $ npm install -g @superblocksteam/cli
14
14
  $ superblocks COMMAND
15
15
  running command...
16
16
  $ superblocks (--version)
17
- @superblocksteam/cli/2.0.3-next.111 linux-x64 node-v20.19.0
17
+ @superblocksteam/cli/2.0.3-next.113 linux-x64 node-v20.19.0
18
18
  $ superblocks --help [COMMAND]
19
19
  USAGE
20
20
  $ superblocks COMMAND
package/dist/index.js CHANGED
@@ -15294,12 +15294,12 @@ var require_http = __commonJS({
15294
15294
  }
15295
15295
  };
15296
15296
  exports2.ForbiddenError = ForbiddenError2;
15297
- var NotFoundError7 = class extends HttpError {
15297
+ var NotFoundError9 = class extends HttpError {
15298
15298
  constructor(message) {
15299
15299
  super(404, message || "Resource not found", "Not found");
15300
15300
  }
15301
15301
  };
15302
- exports2.NotFoundError = NotFoundError7;
15302
+ exports2.NotFoundError = NotFoundError9;
15303
15303
  var RequestTimedOut = class extends HttpError {
15304
15304
  constructor(message) {
15305
15305
  super(408, message || "Request timed out", "Request timeout");
@@ -82723,13 +82723,13 @@ var require_constants7 = __commonJS({
82723
82723
  }
82724
82724
  };
82725
82725
  exports2.FileAccessError = FileAccessError2;
82726
- var NotFoundError7 = class extends Error {
82726
+ var NotFoundError9 = class extends Error {
82727
82727
  constructor(message) {
82728
82728
  super(message);
82729
82729
  this.name = "FileNotFoundError";
82730
82730
  }
82731
82731
  };
82732
- exports2.NotFoundError = NotFoundError7;
82732
+ exports2.NotFoundError = NotFoundError9;
82733
82733
  var BadRequestError2 = class extends Error {
82734
82734
  constructor(message) {
82735
82735
  super(message);
@@ -196476,12 +196476,12 @@ var require_http4 = __commonJS({
196476
196476
  }
196477
196477
  };
196478
196478
  exports2.ForbiddenError = ForbiddenError2;
196479
- var NotFoundError7 = class extends HttpError {
196479
+ var NotFoundError9 = class extends HttpError {
196480
196480
  constructor(message) {
196481
196481
  super(404, message || "Resource not found", "Not found");
196482
196482
  }
196483
196483
  };
196484
- exports2.NotFoundError = NotFoundError7;
196484
+ exports2.NotFoundError = NotFoundError9;
196485
196485
  var RequestTimedOut = class extends HttpError {
196486
196486
  constructor(message) {
196487
196487
  super(408, message || "Request timed out", "Request timeout");
@@ -296331,6 +296331,360 @@ var require_dist10 = __commonJS({
296331
296331
  }
296332
296332
  });
296333
296333
 
296334
+ // ../../../../node_modules/.pnpm/object-assign@4.1.1/node_modules/object-assign/index.js
296335
+ var require_object_assign = __commonJS({
296336
+ "../../../../node_modules/.pnpm/object-assign@4.1.1/node_modules/object-assign/index.js"(exports2, module2) {
296337
+ "use strict";
296338
+ init_cjs_shims();
296339
+ var getOwnPropertySymbols = Object.getOwnPropertySymbols;
296340
+ var hasOwnProperty4 = Object.prototype.hasOwnProperty;
296341
+ var propIsEnumerable = Object.prototype.propertyIsEnumerable;
296342
+ function toObject(val) {
296343
+ if (val === null || val === void 0) {
296344
+ throw new TypeError("Object.assign cannot be called with null or undefined");
296345
+ }
296346
+ return Object(val);
296347
+ }
296348
+ function shouldUseNative() {
296349
+ try {
296350
+ if (!Object.assign) {
296351
+ return false;
296352
+ }
296353
+ var test1 = new String("abc");
296354
+ test1[5] = "de";
296355
+ if (Object.getOwnPropertyNames(test1)[0] === "5") {
296356
+ return false;
296357
+ }
296358
+ var test2 = {};
296359
+ for (var i2 = 0; i2 < 10; i2++) {
296360
+ test2["_" + String.fromCharCode(i2)] = i2;
296361
+ }
296362
+ var order2 = Object.getOwnPropertyNames(test2).map(function(n) {
296363
+ return test2[n];
296364
+ });
296365
+ if (order2.join("") !== "0123456789") {
296366
+ return false;
296367
+ }
296368
+ var test3 = {};
296369
+ "abcdefghijklmnopqrst".split("").forEach(function(letter) {
296370
+ test3[letter] = letter;
296371
+ });
296372
+ if (Object.keys(Object.assign({}, test3)).join("") !== "abcdefghijklmnopqrst") {
296373
+ return false;
296374
+ }
296375
+ return true;
296376
+ } catch (err) {
296377
+ return false;
296378
+ }
296379
+ }
296380
+ module2.exports = shouldUseNative() ? Object.assign : function(target, source2) {
296381
+ var from;
296382
+ var to = toObject(target);
296383
+ var symbols;
296384
+ for (var s = 1; s < arguments.length; s++) {
296385
+ from = Object(arguments[s]);
296386
+ for (var key2 in from) {
296387
+ if (hasOwnProperty4.call(from, key2)) {
296388
+ to[key2] = from[key2];
296389
+ }
296390
+ }
296391
+ if (getOwnPropertySymbols) {
296392
+ symbols = getOwnPropertySymbols(from);
296393
+ for (var i2 = 0; i2 < symbols.length; i2++) {
296394
+ if (propIsEnumerable.call(from, symbols[i2])) {
296395
+ to[symbols[i2]] = from[symbols[i2]];
296396
+ }
296397
+ }
296398
+ }
296399
+ }
296400
+ return to;
296401
+ };
296402
+ }
296403
+ });
296404
+
296405
+ // ../../../../node_modules/.pnpm/vary@1.1.2/node_modules/vary/index.js
296406
+ var require_vary = __commonJS({
296407
+ "../../../../node_modules/.pnpm/vary@1.1.2/node_modules/vary/index.js"(exports2, module2) {
296408
+ "use strict";
296409
+ init_cjs_shims();
296410
+ module2.exports = vary;
296411
+ module2.exports.append = append3;
296412
+ var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
296413
+ function append3(header, field) {
296414
+ if (typeof header !== "string") {
296415
+ throw new TypeError("header argument is required");
296416
+ }
296417
+ if (!field) {
296418
+ throw new TypeError("field argument is required");
296419
+ }
296420
+ var fields = !Array.isArray(field) ? parse12(String(field)) : field;
296421
+ for (var j = 0; j < fields.length; j++) {
296422
+ if (!FIELD_NAME_REGEXP.test(fields[j])) {
296423
+ throw new TypeError("field argument contains an invalid header name");
296424
+ }
296425
+ }
296426
+ if (header === "*") {
296427
+ return header;
296428
+ }
296429
+ var val = header;
296430
+ var vals = parse12(header.toLowerCase());
296431
+ if (fields.indexOf("*") !== -1 || vals.indexOf("*") !== -1) {
296432
+ return "*";
296433
+ }
296434
+ for (var i2 = 0; i2 < fields.length; i2++) {
296435
+ var fld = fields[i2].toLowerCase();
296436
+ if (vals.indexOf(fld) === -1) {
296437
+ vals.push(fld);
296438
+ val = val ? val + ", " + fields[i2] : fields[i2];
296439
+ }
296440
+ }
296441
+ return val;
296442
+ }
296443
+ function parse12(header) {
296444
+ var end = 0;
296445
+ var list = [];
296446
+ var start = 0;
296447
+ for (var i2 = 0, len = header.length; i2 < len; i2++) {
296448
+ switch (header.charCodeAt(i2)) {
296449
+ case 32:
296450
+ if (start === end) {
296451
+ start = end = i2 + 1;
296452
+ }
296453
+ break;
296454
+ case 44:
296455
+ list.push(header.substring(start, end));
296456
+ start = end = i2 + 1;
296457
+ break;
296458
+ default:
296459
+ end = i2 + 1;
296460
+ break;
296461
+ }
296462
+ }
296463
+ list.push(header.substring(start, end));
296464
+ return list;
296465
+ }
296466
+ function vary(res, field) {
296467
+ if (!res || !res.getHeader || !res.setHeader) {
296468
+ throw new TypeError("res argument is required");
296469
+ }
296470
+ var val = res.getHeader("Vary") || "";
296471
+ var header = Array.isArray(val) ? val.join(", ") : String(val);
296472
+ if (val = append3(header, field)) {
296473
+ res.setHeader("Vary", val);
296474
+ }
296475
+ }
296476
+ }
296477
+ });
296478
+
296479
+ // ../../../../node_modules/.pnpm/cors@2.8.5/node_modules/cors/lib/index.js
296480
+ var require_lib33 = __commonJS({
296481
+ "../../../../node_modules/.pnpm/cors@2.8.5/node_modules/cors/lib/index.js"(exports2, module2) {
296482
+ init_cjs_shims();
296483
+ (function() {
296484
+ "use strict";
296485
+ var assign = require_object_assign();
296486
+ var vary = require_vary();
296487
+ var defaults3 = {
296488
+ origin: "*",
296489
+ methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
296490
+ preflightContinue: false,
296491
+ optionsSuccessStatus: 204
296492
+ };
296493
+ function isString2(s) {
296494
+ return typeof s === "string" || s instanceof String;
296495
+ }
296496
+ function isOriginAllowed(origin2, allowedOrigin) {
296497
+ if (Array.isArray(allowedOrigin)) {
296498
+ for (var i2 = 0; i2 < allowedOrigin.length; ++i2) {
296499
+ if (isOriginAllowed(origin2, allowedOrigin[i2])) {
296500
+ return true;
296501
+ }
296502
+ }
296503
+ return false;
296504
+ } else if (isString2(allowedOrigin)) {
296505
+ return origin2 === allowedOrigin;
296506
+ } else if (allowedOrigin instanceof RegExp) {
296507
+ return allowedOrigin.test(origin2);
296508
+ } else {
296509
+ return !!allowedOrigin;
296510
+ }
296511
+ }
296512
+ function configureOrigin(options8, req) {
296513
+ var requestOrigin = req.headers.origin, headers = [], isAllowed;
296514
+ if (!options8.origin || options8.origin === "*") {
296515
+ headers.push([{
296516
+ key: "Access-Control-Allow-Origin",
296517
+ value: "*"
296518
+ }]);
296519
+ } else if (isString2(options8.origin)) {
296520
+ headers.push([{
296521
+ key: "Access-Control-Allow-Origin",
296522
+ value: options8.origin
296523
+ }]);
296524
+ headers.push([{
296525
+ key: "Vary",
296526
+ value: "Origin"
296527
+ }]);
296528
+ } else {
296529
+ isAllowed = isOriginAllowed(requestOrigin, options8.origin);
296530
+ headers.push([{
296531
+ key: "Access-Control-Allow-Origin",
296532
+ value: isAllowed ? requestOrigin : false
296533
+ }]);
296534
+ headers.push([{
296535
+ key: "Vary",
296536
+ value: "Origin"
296537
+ }]);
296538
+ }
296539
+ return headers;
296540
+ }
296541
+ function configureMethods(options8) {
296542
+ var methods = options8.methods;
296543
+ if (methods.join) {
296544
+ methods = options8.methods.join(",");
296545
+ }
296546
+ return {
296547
+ key: "Access-Control-Allow-Methods",
296548
+ value: methods
296549
+ };
296550
+ }
296551
+ function configureCredentials(options8) {
296552
+ if (options8.credentials === true) {
296553
+ return {
296554
+ key: "Access-Control-Allow-Credentials",
296555
+ value: "true"
296556
+ };
296557
+ }
296558
+ return null;
296559
+ }
296560
+ function configureAllowedHeaders(options8, req) {
296561
+ var allowedHeaders = options8.allowedHeaders || options8.headers;
296562
+ var headers = [];
296563
+ if (!allowedHeaders) {
296564
+ allowedHeaders = req.headers["access-control-request-headers"];
296565
+ headers.push([{
296566
+ key: "Vary",
296567
+ value: "Access-Control-Request-Headers"
296568
+ }]);
296569
+ } else if (allowedHeaders.join) {
296570
+ allowedHeaders = allowedHeaders.join(",");
296571
+ }
296572
+ if (allowedHeaders && allowedHeaders.length) {
296573
+ headers.push([{
296574
+ key: "Access-Control-Allow-Headers",
296575
+ value: allowedHeaders
296576
+ }]);
296577
+ }
296578
+ return headers;
296579
+ }
296580
+ function configureExposedHeaders(options8) {
296581
+ var headers = options8.exposedHeaders;
296582
+ if (!headers) {
296583
+ return null;
296584
+ } else if (headers.join) {
296585
+ headers = headers.join(",");
296586
+ }
296587
+ if (headers && headers.length) {
296588
+ return {
296589
+ key: "Access-Control-Expose-Headers",
296590
+ value: headers
296591
+ };
296592
+ }
296593
+ return null;
296594
+ }
296595
+ function configureMaxAge(options8) {
296596
+ var maxAge = (typeof options8.maxAge === "number" || options8.maxAge) && options8.maxAge.toString();
296597
+ if (maxAge && maxAge.length) {
296598
+ return {
296599
+ key: "Access-Control-Max-Age",
296600
+ value: maxAge
296601
+ };
296602
+ }
296603
+ return null;
296604
+ }
296605
+ function applyHeaders(headers, res) {
296606
+ for (var i2 = 0, n = headers.length; i2 < n; i2++) {
296607
+ var header = headers[i2];
296608
+ if (header) {
296609
+ if (Array.isArray(header)) {
296610
+ applyHeaders(header, res);
296611
+ } else if (header.key === "Vary" && header.value) {
296612
+ vary(res, header.value);
296613
+ } else if (header.value) {
296614
+ res.setHeader(header.key, header.value);
296615
+ }
296616
+ }
296617
+ }
296618
+ }
296619
+ function cors2(options8, req, res, next) {
296620
+ var headers = [], method = req.method && req.method.toUpperCase && req.method.toUpperCase();
296621
+ if (method === "OPTIONS") {
296622
+ headers.push(configureOrigin(options8, req));
296623
+ headers.push(configureCredentials(options8, req));
296624
+ headers.push(configureMethods(options8, req));
296625
+ headers.push(configureAllowedHeaders(options8, req));
296626
+ headers.push(configureMaxAge(options8, req));
296627
+ headers.push(configureExposedHeaders(options8, req));
296628
+ applyHeaders(headers, res);
296629
+ if (options8.preflightContinue) {
296630
+ next();
296631
+ } else {
296632
+ res.statusCode = options8.optionsSuccessStatus;
296633
+ res.setHeader("Content-Length", "0");
296634
+ res.end();
296635
+ }
296636
+ } else {
296637
+ headers.push(configureOrigin(options8, req));
296638
+ headers.push(configureCredentials(options8, req));
296639
+ headers.push(configureExposedHeaders(options8, req));
296640
+ applyHeaders(headers, res);
296641
+ next();
296642
+ }
296643
+ }
296644
+ function middlewareWrapper(o) {
296645
+ var optionsCallback = null;
296646
+ if (typeof o === "function") {
296647
+ optionsCallback = o;
296648
+ } else {
296649
+ optionsCallback = function(req, cb) {
296650
+ cb(null, o);
296651
+ };
296652
+ }
296653
+ return function corsMiddleware(req, res, next) {
296654
+ optionsCallback(req, function(err, options8) {
296655
+ if (err) {
296656
+ next(err);
296657
+ } else {
296658
+ var corsOptions = assign({}, defaults3, options8);
296659
+ var originCallback = null;
296660
+ if (corsOptions.origin && typeof corsOptions.origin === "function") {
296661
+ originCallback = corsOptions.origin;
296662
+ } else if (corsOptions.origin) {
296663
+ originCallback = function(origin2, cb) {
296664
+ cb(null, corsOptions.origin);
296665
+ };
296666
+ }
296667
+ if (originCallback) {
296668
+ originCallback(req.headers.origin, function(err2, origin2) {
296669
+ if (err2 || !origin2) {
296670
+ next(err2);
296671
+ } else {
296672
+ corsOptions.origin = origin2;
296673
+ cors2(corsOptions, req, res, next);
296674
+ }
296675
+ });
296676
+ } else {
296677
+ next();
296678
+ }
296679
+ }
296680
+ });
296681
+ };
296682
+ }
296683
+ module2.exports = middlewareWrapper;
296684
+ })();
296685
+ }
296686
+ });
296687
+
296334
296688
  // ../../../../node_modules/.pnpm/merge-descriptors@1.0.3/node_modules/merge-descriptors/index.js
296335
296689
  var require_merge_descriptors = __commonJS({
296336
296690
  "../../../../node_modules/.pnpm/merge-descriptors@1.0.3/node_modules/merge-descriptors/index.js"(exports2, module2) {
@@ -300753,80 +301107,6 @@ var require_cookie2 = __commonJS({
300753
301107
  }
300754
301108
  });
300755
301109
 
300756
- // ../../../../node_modules/.pnpm/vary@1.1.2/node_modules/vary/index.js
300757
- var require_vary = __commonJS({
300758
- "../../../../node_modules/.pnpm/vary@1.1.2/node_modules/vary/index.js"(exports2, module2) {
300759
- "use strict";
300760
- init_cjs_shims();
300761
- module2.exports = vary;
300762
- module2.exports.append = append3;
300763
- var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
300764
- function append3(header, field) {
300765
- if (typeof header !== "string") {
300766
- throw new TypeError("header argument is required");
300767
- }
300768
- if (!field) {
300769
- throw new TypeError("field argument is required");
300770
- }
300771
- var fields = !Array.isArray(field) ? parse12(String(field)) : field;
300772
- for (var j = 0; j < fields.length; j++) {
300773
- if (!FIELD_NAME_REGEXP.test(fields[j])) {
300774
- throw new TypeError("field argument contains an invalid header name");
300775
- }
300776
- }
300777
- if (header === "*") {
300778
- return header;
300779
- }
300780
- var val = header;
300781
- var vals = parse12(header.toLowerCase());
300782
- if (fields.indexOf("*") !== -1 || vals.indexOf("*") !== -1) {
300783
- return "*";
300784
- }
300785
- for (var i2 = 0; i2 < fields.length; i2++) {
300786
- var fld = fields[i2].toLowerCase();
300787
- if (vals.indexOf(fld) === -1) {
300788
- vals.push(fld);
300789
- val = val ? val + ", " + fields[i2] : fields[i2];
300790
- }
300791
- }
300792
- return val;
300793
- }
300794
- function parse12(header) {
300795
- var end = 0;
300796
- var list = [];
300797
- var start = 0;
300798
- for (var i2 = 0, len = header.length; i2 < len; i2++) {
300799
- switch (header.charCodeAt(i2)) {
300800
- case 32:
300801
- if (start === end) {
300802
- start = end = i2 + 1;
300803
- }
300804
- break;
300805
- case 44:
300806
- list.push(header.substring(start, end));
300807
- start = end = i2 + 1;
300808
- break;
300809
- default:
300810
- end = i2 + 1;
300811
- break;
300812
- }
300813
- }
300814
- list.push(header.substring(start, end));
300815
- return list;
300816
- }
300817
- function vary(res, field) {
300818
- if (!res || !res.getHeader || !res.setHeader) {
300819
- throw new TypeError("res argument is required");
300820
- }
300821
- var val = res.getHeader("Vary") || "";
300822
- var header = Array.isArray(val) ? val.join(", ") : String(val);
300823
- if (val = append3(header, field)) {
300824
- res.setHeader("Vary", val);
300825
- }
300826
- }
300827
- }
300828
- });
300829
-
300830
301110
  // ../../../../node_modules/.pnpm/express@4.21.2/node_modules/express/lib/response.js
300831
301111
  var require_response5 = __commonJS({
300832
301112
  "../../../../node_modules/.pnpm/express@4.21.2/node_modules/express/lib/response.js"(exports2, module2) {
@@ -328881,7 +329161,7 @@ var import_dd_trace = __toESM(require_dd_trace2(), 1);
328881
329161
  // ../sdk/package.json
328882
329162
  var package_default = {
328883
329163
  name: "@superblocksteam/sdk",
328884
- version: "2.0.3-next.111",
329164
+ version: "2.0.3-next.113",
328885
329165
  type: "module",
328886
329166
  description: "Superblocks JS SDK",
328887
329167
  homepage: "https://www.superblocks.com",
@@ -328911,13 +329191,14 @@ var package_default = {
328911
329191
  "@rollup/wasm-node": "^4.35.0",
328912
329192
  "@superblocksteam/bucketeer-sdk": "0.4.1",
328913
329193
  "@superblocksteam/shared": "^0.9081.0",
328914
- "@superblocksteam/util": "2.0.3-next.111",
328915
- "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.111",
329194
+ "@superblocksteam/util": "2.0.3-next.113",
329195
+ "@superblocksteam/vite-plugin-file-sync": "2.0.3-next.113",
328916
329196
  "@vitejs/plugin-react": "^4.3.4",
328917
329197
  axios: "^1.4.0",
328918
329198
  chokidar: "^4.0.3",
328919
329199
  colorette: "^2.0.20",
328920
329200
  "common-tags": "^1.8.2",
329201
+ cors: "^2.8.5",
328921
329202
  "dd-trace": "^5.49.0",
328922
329203
  debug: "^4.4.0",
328923
329204
  "es-module-lexer": "^1.6.0",
@@ -328942,6 +329223,7 @@ var package_default = {
328942
329223
  "@types/chai": "^4",
328943
329224
  "@types/chai-as-promised": "^8.0.2",
328944
329225
  "@types/common-tags": "^1.8.4",
329226
+ "@types/cors": "^2.8.18",
328945
329227
  "@types/debug": "^4.1.12",
328946
329228
  "@types/express": "^4.17.10",
328947
329229
  "@types/fs-extra": "^11.0.4",
@@ -369015,6 +369297,8 @@ async function unwrapResponseDto(request) {
369015
369297
  const errorMessage = response.responseMeta.error?.message ?? response.responseMeta.message ?? `Request failed with status ${response.responseMeta.status}`;
369016
369298
  if (response.responseMeta.status === 409) {
369017
369299
  throw new import_shared17.ConflictError(errorMessage);
369300
+ } else if (response.responseMeta.status === 404) {
369301
+ throw new import_shared16.NotFoundError(errorMessage);
369018
369302
  }
369019
369303
  throw new Error(errorMessage);
369020
369304
  }
@@ -369109,7 +369393,7 @@ var LockService = class extends EventEmitter7 {
369109
369393
  this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
369110
369394
  this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
369111
369395
  await this.shutdown();
369112
- throw new Error(`Lock is already acquired: ${error}`);
369396
+ throw new Error(`${error}`);
369113
369397
  } else {
369114
369398
  throw new Error(`Error acquiring lock: ${error}`);
369115
369399
  }
@@ -369165,8 +369449,16 @@ var LockService = class extends EventEmitter7 {
369165
369449
  this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
369166
369450
  this.status = LockServiceStatus.LOCK_INVALID;
369167
369451
  await this.shutdown();
369452
+ process.exit(1);
369453
+ } else if (error instanceof import_shared18.NotFoundError) {
369454
+ logger3.error("[lock-service] Lock is not found, shutting down", getErrorMeta(error));
369455
+ this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
369456
+ this.status = LockServiceStatus.LOCK_INVALID;
369457
+ await this.shutdown();
369458
+ process.exit(1);
369459
+ } else {
369460
+ logger3.error("[lock-service] error checking and updating lock", getErrorMeta(error));
369168
369461
  }
369169
- logger3.error("[lock-service] error checking and updating lock", getErrorMeta(error));
369170
369462
  throw error;
369171
369463
  }
369172
369464
  }
@@ -369179,11 +369471,13 @@ var LockService = class extends EventEmitter7 {
369179
369471
  * This ensures the lock is released
369180
369472
  */
369181
369473
  async shutdown() {
369474
+ const logger3 = getLogger();
369182
369475
  this.stopHeartbeat();
369183
369476
  if (this.isLocked) {
369184
369477
  await this.releaseLock();
369185
369478
  }
369186
369479
  await this.closeRpcClient();
369480
+ logger3.info("[lock-service] shutting down and exiting dev server");
369187
369481
  }
369188
369482
  /**
369189
369483
  * Add a connected user to the lock service.
@@ -369219,12 +369513,13 @@ var LockService = class extends EventEmitter7 {
369219
369513
  this._heartbeatTimeout = setTimeout(() => this.scheduleNextHeartbeat(), this.heartbeatIntervalMs);
369220
369514
  }
369221
369515
  } catch (error) {
369222
- logger3.error("[lock-service] error sending heartbeat", getErrorMeta(error));
369223
- this.emit("statusChange", LockServiceStatus.FAILED_TO_ACQUIRE_LOCK);
369224
- this.status = LockServiceStatus.FAILED_TO_ACQUIRE_LOCK;
369516
+ logger3.error("[lock-service] Error sending heartbeat, shutting down", getErrorMeta(error));
369517
+ this.emit("statusChange", LockServiceStatus.LOCK_INVALID);
369518
+ this.status = LockServiceStatus.LOCK_INVALID;
369225
369519
  clearTimeout(this._heartbeatTimeout);
369226
369520
  this._heartbeatTimeout = void 0;
369227
369521
  await this.shutdown();
369522
+ process.exit(1);
369228
369523
  }
369229
369524
  }
369230
369525
  async sendHeartbeat() {
@@ -369937,11 +370232,11 @@ var fileSyncVitePlugin = (pluginParams, options8) => {
369937
370232
  if (lockService) {
369938
370233
  lockService.on("statusChange", (status) => {
369939
370234
  if (status === LockServiceStatus.FAILED_TO_ACQUIRE_LOCK) {
369940
- sendError(makeServerError(new Error("Lock is already acquired by another user. Please try again later.")));
370235
+ sendError(makeServerError(new Error("Error establishing connection to editing session. Please refresh the page.")));
369941
370236
  } else if (status === LockServiceStatus.LOCK_INVALID) {
369942
- sendError(makeServerError(new Error("Lock is invalid. Please try again.")));
370237
+ sendError(makeServerError(new Error("Error renewing connection to editing session. Please refresh the page.")));
369943
370238
  } else if (status === LockServiceStatus.LOCK_RELEASED) {
369944
- sendError(makeServerError(new Error("Lock is released. Please refresh the page or move to local mode.")));
370239
+ sendError(makeServerError(new Error("Editing session is no longer active. Please refresh the page or move to local mode.")));
369945
370240
  } else if (status === LockServiceStatus.RELEASING) {
369946
370241
  socketManager.callEditorClients(async (socket) => {
369947
370242
  try {
@@ -370202,6 +370497,7 @@ async function getAppScope(fileSyncManager) {
370202
370497
 
370203
370498
  // ../sdk/dist/dev-utils/dev-server.mjs
370204
370499
  import react2 from "@vitejs/plugin-react";
370500
+ var import_cors = __toESM(require_lib33(), 1);
370205
370501
  var import_express = __toESM(require_express3(), 1);
370206
370502
  import { createLogger as createLogger3, createServer, loadEnv } from "vite";
370207
370503
 
@@ -373229,8 +373525,11 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
373229
373525
  });
373230
373526
  }
373231
373527
  }
373528
+ app.use((0, import_cors.default)({
373529
+ origin: true,
373530
+ credentials: true
373531
+ }));
373232
373532
  app.use((req, res, next) => {
373233
- res.setHeader("Access-Control-Allow-Origin", "*");
373234
373533
  if (req.url === "/_sb_connect" || req.url === "/_sb_disconnect" || req.url === "/_sb_health" || req.url === "/_sb_status") {
373235
373534
  return next();
373236
373535
  }
@@ -373244,18 +373543,17 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
373244
373543
  });
373245
373544
  app.get("/_sb_health", async (_req, res) => {
373246
373545
  res.setHeader("Content-Type", "application/json");
373247
- res.setHeader("Access-Control-Allow-Origin", "*");
373248
373546
  res.send(JSON.stringify(healthResponse));
373249
373547
  });
373250
373548
  app.get("/_sb_connect", async (_req, res) => {
373251
373549
  res.setHeader("Content-Type", "application/json");
373252
- res.setHeader("Access-Control-Allow-Origin", "*");
373253
373550
  if (isViteServerInitialized) {
373254
373551
  res.send(JSON.stringify(healthResponse));
373255
373552
  return;
373256
373553
  }
373257
373554
  isViteServerInitialized = true;
373258
373555
  startVite({
373556
+ port,
373259
373557
  app,
373260
373558
  root: root2,
373261
373559
  mode,
@@ -373277,7 +373575,6 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
373277
373575
  });
373278
373576
  app.get("/_sb_status", async (_req, res) => {
373279
373577
  res.setHeader("Content-Type", "application/json");
373280
- res.setHeader("Access-Control-Allow-Origin", "*");
373281
373578
  if (lockService?.isLocked) {
373282
373579
  res.send({
373283
373580
  connectedUsers: lockService.connectedUsers
@@ -373303,7 +373600,7 @@ async function createDevServer({ root: root2, mode, fsOperationQueue, syncServic
373303
373600
  httpServer = await app.listen(port);
373304
373601
  return httpServer;
373305
373602
  }
373306
- async function startVite({ app, httpServer: httpServer2, root: root2, mode, fsOperationQueue, syncService, lockService, aiService, logger: loggerOverride }) {
373603
+ async function startVite({ app, httpServer: httpServer2, root: root2, mode, fsOperationQueue, syncService, lockService, aiService, port, logger: loggerOverride }) {
373307
373604
  const viteLogger = createLogger3();
373308
373605
  const logger3 = getLogger2(loggerOverride);
373309
373606
  viteLogger.info = logger3.info;
@@ -373345,7 +373642,13 @@ async function startVite({ app, httpServer: httpServer2, root: root2, mode, fsOp
373345
373642
  ignored: [`${customFolder}/**/*`]
373346
373643
  },
373347
373644
  hmr: {
373348
- port: hmrPort
373645
+ port: hmrPort,
373646
+ clientPort: port,
373647
+ server: httpServer2
373648
+ },
373649
+ cors: {
373650
+ origin: true,
373651
+ credentials: true
373349
373652
  }
373350
373653
  },
373351
373654
  build: {
@@ -396024,6 +396327,20 @@ body-parser/lib/types/text.js:
396024
396327
  * MIT Licensed
396025
396328
  *)
396026
396329
 
396330
+ object-assign/index.js:
396331
+ (*
396332
+ object-assign
396333
+ (c) Sindre Sorhus
396334
+ @license MIT
396335
+ *)
396336
+
396337
+ vary/index.js:
396338
+ (*!
396339
+ * vary
396340
+ * Copyright(c) 2014-2017 Douglas Christopher Wilson
396341
+ * MIT Licensed
396342
+ *)
396343
+
396027
396344
  merge-descriptors/index.js:
396028
396345
  (*!
396029
396346
  * merge-descriptors
@@ -396187,13 +396504,6 @@ cookie/index.js:
396187
396504
  * MIT Licensed
396188
396505
  *)
396189
396506
 
396190
- vary/index.js:
396191
- (*!
396192
- * vary
396193
- * Copyright(c) 2014-2017 Douglas Christopher Wilson
396194
- * MIT Licensed
396195
- *)
396196
-
396197
396507
  serve-static/index.js:
396198
396508
  (*!
396199
396509
  * serve-static
@@ -509,5 +509,5 @@
509
509
  "strict": true
510
510
  }
511
511
  },
512
- "version": "2.0.3-next.111"
512
+ "version": "2.0.3-next.113"
513
513
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@superblocksteam/cli",
3
- "version": "2.0.3-next.111",
3
+ "version": "2.0.3-next.113",
4
4
  "type": "module",
5
5
  "description": "Official Superblocks CLI",
6
6
  "homepage": "https://www.superblocks.com",
@@ -42,9 +42,9 @@
42
42
  "devDependencies": {
43
43
  "@eslint/js": "^9.16.0",
44
44
  "@oclif/test": "^4.1.11",
45
- "@superblocksteam/sdk": "2.0.3-next.111",
45
+ "@superblocksteam/sdk": "2.0.3-next.113",
46
46
  "@superblocksteam/shared": "^0.9081.0",
47
- "@superblocksteam/util": "2.0.3-next.111",
47
+ "@superblocksteam/util": "2.0.3-next.113",
48
48
  "@types/babel__core": "^7.20.0",
49
49
  "@types/chai": "^4",
50
50
  "@types/fs-extra": "^11.0.1",