@superblocksteam/sdk 2.0.10 → 2.0.11-next.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AA+BpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA8D5D,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAEjC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IAGtC,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC;IAGnD,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,iBAwQA"}
|
|
@@ -2,6 +2,7 @@ import "../dev-utils/dev-tracer.js";
|
|
|
2
2
|
import * as child_process from "node:child_process";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
|
+
import { SpanStatusCode } from "@opentelemetry/api";
|
|
5
6
|
import { maskUnixSignals } from "@superblocksteam/util";
|
|
6
7
|
import { AiService } from "@superblocksteam/vite-plugin-file-sync/ai-service";
|
|
7
8
|
import { LockService, LockType, } from "@superblocksteam/vite-plugin-file-sync/lock-service";
|
|
@@ -107,23 +108,36 @@ export async function dev(options) {
|
|
|
107
108
|
await maskUnixSignals(async () => {
|
|
108
109
|
const sdk = new SuperblocksSdk(applicationConfig.token, applicationConfig.superblocksBaseUrl, "");
|
|
109
110
|
if (lockService) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
111
|
+
await tracer.startActiveSpan("acquiringInitialLock", async (span) => {
|
|
112
|
+
try {
|
|
113
|
+
await lockService.acquireLock();
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
logger.error("Failed to acquire lock on application", getErrorMeta(error));
|
|
117
|
+
span.setStatus({
|
|
118
|
+
code: SpanStatusCode.ERROR,
|
|
119
|
+
message: JSON.stringify(error),
|
|
120
|
+
});
|
|
121
|
+
passErrorToVSCode(error.context?.message, logger);
|
|
122
|
+
throw new Error(`Failed to acquire lock on application: ${error}`);
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
span.end();
|
|
126
|
+
}
|
|
127
|
+
});
|
|
118
128
|
}
|
|
119
|
-
const [localContents, serverHash, currentUser] = await
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
129
|
+
const [localContents, serverHash, currentUser] = await tracer.startActiveSpan("fetchInitInfo", async (span) => {
|
|
130
|
+
const results = await Promise.all([
|
|
131
|
+
sdk.hashLocalDirectory(cwd),
|
|
132
|
+
sdk.dbfsGetApplicationDirectoryHash({
|
|
133
|
+
applicationId: applicationConfig.id,
|
|
134
|
+
branch: applicationConfig.branchName,
|
|
135
|
+
}),
|
|
136
|
+
sdk.fetchCurrentUser(),
|
|
137
|
+
]);
|
|
138
|
+
span.end();
|
|
139
|
+
return results;
|
|
140
|
+
});
|
|
127
141
|
aiService = new AiService({
|
|
128
142
|
authToken: applicationConfig.token,
|
|
129
143
|
superblocksBaseUrl: applicationConfig.superblocksBaseUrl,
|
|
@@ -149,42 +163,54 @@ export async function dev(options) {
|
|
|
149
163
|
}
|
|
150
164
|
let hasPackageChanged = false;
|
|
151
165
|
if (downloadFirst) {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
166
|
+
await tracer.startActiveSpan("downloadFirst", async (span) => {
|
|
167
|
+
logger.info(`Starting download of branch '${applicationConfig.branchName}'`);
|
|
168
|
+
const packageJsonBefore = await readPkgJson(cwd);
|
|
169
|
+
await syncService.downloadDirectory();
|
|
170
|
+
const packageJsonAfter = await readPkgJson(cwd);
|
|
171
|
+
if (packageJsonBefore && packageJsonAfter) {
|
|
172
|
+
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
173
|
+
hasPackageChanged = diff.some((part) => part.added || part.removed);
|
|
174
|
+
}
|
|
175
|
+
else if (packageJsonAfter) {
|
|
176
|
+
hasPackageChanged = true;
|
|
177
|
+
logger.info("package.json was created, installing packages…");
|
|
178
|
+
}
|
|
179
|
+
span.end();
|
|
180
|
+
});
|
|
164
181
|
}
|
|
165
182
|
let hasCliUpdated = false;
|
|
166
183
|
if (!process.env.PACKAGE_SUFFIX ||
|
|
167
184
|
process.env.PACKAGE_SUFFIX === "" ||
|
|
168
185
|
!skipAutoUpgrade) {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
186
|
+
await tracer.startActiveSpan("versionCheckAndUpgrade", async (span) => {
|
|
187
|
+
if (lockService) {
|
|
188
|
+
const result = await checkVersionsAndUpgrade(lockService, applicationConfig);
|
|
189
|
+
if (result?.libraryUpdated) {
|
|
190
|
+
hasPackageChanged = true;
|
|
191
|
+
}
|
|
192
|
+
hasCliUpdated = result?.cliUpdated ?? false;
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
logger.warn("Lock service is not available, skipping version check and upgrade");
|
|
173
196
|
}
|
|
174
|
-
|
|
175
|
-
}
|
|
176
|
-
else {
|
|
177
|
-
logger.warn("Lock service is not available, skipping version check and upgrade");
|
|
178
|
-
}
|
|
197
|
+
span.end();
|
|
198
|
+
});
|
|
179
199
|
}
|
|
180
200
|
if (hasPackageChanged) {
|
|
181
201
|
logger.info("Installing packages…");
|
|
182
|
-
await installPackages
|
|
202
|
+
await tracer.startActiveSpan("installPackages", async (span) => {
|
|
203
|
+
await installPackages(cwd, logger);
|
|
204
|
+
span.end();
|
|
205
|
+
});
|
|
183
206
|
}
|
|
184
207
|
if (hasPackageChanged || uploadFirst) {
|
|
185
208
|
logger.info(`Uploading local files to branch '${applicationConfig.branchName}' on server before starting`);
|
|
186
|
-
await
|
|
187
|
-
|
|
209
|
+
await tracer.startActiveSpan("uploadFirstOrPackageChanged", async (span) => {
|
|
210
|
+
await syncService.uploadDirectory();
|
|
211
|
+
await syncService.uploadDirectoryNowIfNeeded();
|
|
212
|
+
span.end();
|
|
213
|
+
});
|
|
188
214
|
}
|
|
189
215
|
if (hasCliUpdated) {
|
|
190
216
|
logger.info("CLI was updated, restarting the dev server…");
|
|
@@ -206,15 +232,19 @@ export async function dev(options) {
|
|
|
206
232
|
else {
|
|
207
233
|
logger.info("Skipping directory sync");
|
|
208
234
|
}
|
|
209
|
-
const httpServer = await createDevServer({
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
235
|
+
const httpServer = await tracer.startActiveSpan("createDevServer", async (span) => {
|
|
236
|
+
const result = await createDevServer({
|
|
237
|
+
root: options.cwd,
|
|
238
|
+
mode: "development",
|
|
239
|
+
port: port,
|
|
240
|
+
fsOperationQueue,
|
|
241
|
+
syncService,
|
|
242
|
+
lockService,
|
|
243
|
+
aiService,
|
|
244
|
+
logger: options.logger,
|
|
245
|
+
});
|
|
246
|
+
span.end();
|
|
247
|
+
return result;
|
|
218
248
|
});
|
|
219
249
|
options.signal?.addEventListener("abort", () => {
|
|
220
250
|
logger.info("Server closed");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dev.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/sdk",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.11-next.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Superblocks JS SDK",
|
|
6
6
|
"homepage": "https://www.superblocks.com",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
31
31
|
"@rollup/wasm-node": "^4.35.0",
|
|
32
32
|
"@superblocksteam/bucketeer-sdk": "0.5.0",
|
|
33
|
-
"@superblocksteam/library": "2.0.
|
|
34
|
-
"@superblocksteam/library-shared": "2.0.
|
|
33
|
+
"@superblocksteam/library": "2.0.11-next.1",
|
|
34
|
+
"@superblocksteam/library-shared": "2.0.11-next.1",
|
|
35
35
|
"@superblocksteam/shared": "0.9260.0",
|
|
36
|
-
"@superblocksteam/util": "2.0.
|
|
37
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.
|
|
36
|
+
"@superblocksteam/util": "2.0.11-next.1",
|
|
37
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.11-next.1",
|
|
38
38
|
"@vitejs/plugin-react": "^4.3.4",
|
|
39
39
|
"axios": "^1.4.0",
|
|
40
40
|
"chokidar": "^4.0.3",
|
|
@@ -3,6 +3,7 @@ import "../dev-utils/dev-tracer.js";
|
|
|
3
3
|
import * as child_process from "node:child_process";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { promisify } from "node:util";
|
|
6
|
+
import { SpanStatusCode } from "@opentelemetry/api";
|
|
6
7
|
import { maskUnixSignals } from "@superblocksteam/util";
|
|
7
8
|
import { AiService } from "@superblocksteam/vite-plugin-file-sync/ai-service";
|
|
8
9
|
import {
|
|
@@ -183,29 +184,44 @@ export async function dev(options: {
|
|
|
183
184
|
);
|
|
184
185
|
|
|
185
186
|
if (lockService) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
(
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
187
|
+
await tracer.startActiveSpan("acquiringInitialLock", async (span) => {
|
|
188
|
+
try {
|
|
189
|
+
await lockService!.acquireLock();
|
|
190
|
+
} catch (error) {
|
|
191
|
+
logger.error(
|
|
192
|
+
"Failed to acquire lock on application",
|
|
193
|
+
getErrorMeta(error),
|
|
194
|
+
);
|
|
195
|
+
span.setStatus({
|
|
196
|
+
code: SpanStatusCode.ERROR,
|
|
197
|
+
message: JSON.stringify(error),
|
|
198
|
+
});
|
|
199
|
+
passErrorToVSCode(
|
|
200
|
+
(error as { context?: { message: string } }).context?.message,
|
|
201
|
+
logger,
|
|
202
|
+
);
|
|
203
|
+
throw new Error(
|
|
204
|
+
`Failed to acquire lock on application: ${error}`,
|
|
205
|
+
);
|
|
206
|
+
} finally {
|
|
207
|
+
span.end();
|
|
208
|
+
}
|
|
209
|
+
});
|
|
199
210
|
}
|
|
200
211
|
|
|
201
|
-
const [localContents, serverHash, currentUser] =
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
212
|
+
const [localContents, serverHash, currentUser] =
|
|
213
|
+
await tracer.startActiveSpan("fetchInitInfo", async (span) => {
|
|
214
|
+
const results = await Promise.all([
|
|
215
|
+
sdk.hashLocalDirectory(cwd),
|
|
216
|
+
sdk.dbfsGetApplicationDirectoryHash({
|
|
217
|
+
applicationId: applicationConfig.id,
|
|
218
|
+
branch: applicationConfig.branchName,
|
|
219
|
+
}),
|
|
220
|
+
sdk.fetchCurrentUser(),
|
|
221
|
+
]);
|
|
222
|
+
span.end();
|
|
223
|
+
return results;
|
|
224
|
+
});
|
|
209
225
|
|
|
210
226
|
aiService = new AiService({
|
|
211
227
|
authToken: applicationConfig.token,
|
|
@@ -242,21 +258,26 @@ export async function dev(options: {
|
|
|
242
258
|
let hasPackageChanged = false;
|
|
243
259
|
|
|
244
260
|
if (downloadFirst) {
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
261
|
+
await tracer.startActiveSpan("downloadFirst", async (span) => {
|
|
262
|
+
logger.info(
|
|
263
|
+
`Starting download of branch '${applicationConfig.branchName}'`,
|
|
264
|
+
);
|
|
265
|
+
|
|
266
|
+
const packageJsonBefore = await readPkgJson(cwd);
|
|
267
|
+
await syncService!.downloadDirectory();
|
|
268
|
+
const packageJsonAfter = await readPkgJson(cwd);
|
|
248
269
|
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
}
|
|
270
|
+
if (packageJsonBefore && packageJsonAfter) {
|
|
271
|
+
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
272
|
+
hasPackageChanged = diff.some(
|
|
273
|
+
(part) => part.added || part.removed,
|
|
274
|
+
);
|
|
275
|
+
} else if (packageJsonAfter) {
|
|
276
|
+
hasPackageChanged = true;
|
|
277
|
+
logger.info("package.json was created, installing packages…");
|
|
278
|
+
}
|
|
279
|
+
span.end();
|
|
280
|
+
});
|
|
260
281
|
}
|
|
261
282
|
|
|
262
283
|
let hasCliUpdated = false;
|
|
@@ -265,33 +286,48 @@ export async function dev(options: {
|
|
|
265
286
|
process.env.PACKAGE_SUFFIX === "" ||
|
|
266
287
|
!skipAutoUpgrade
|
|
267
288
|
) {
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
289
|
+
await tracer.startActiveSpan(
|
|
290
|
+
"versionCheckAndUpgrade",
|
|
291
|
+
async (span) => {
|
|
292
|
+
if (lockService) {
|
|
293
|
+
const result = await checkVersionsAndUpgrade(
|
|
294
|
+
lockService,
|
|
295
|
+
applicationConfig,
|
|
296
|
+
);
|
|
297
|
+
if (result?.libraryUpdated) {
|
|
298
|
+
hasPackageChanged = true;
|
|
299
|
+
}
|
|
300
|
+
hasCliUpdated = result?.cliUpdated ?? false;
|
|
301
|
+
} else {
|
|
302
|
+
logger.warn(
|
|
303
|
+
"Lock service is not available, skipping version check and upgrade",
|
|
304
|
+
);
|
|
305
|
+
}
|
|
306
|
+
span.end();
|
|
307
|
+
},
|
|
308
|
+
);
|
|
282
309
|
}
|
|
283
310
|
|
|
284
311
|
if (hasPackageChanged) {
|
|
285
312
|
logger.info("Installing packages…");
|
|
286
|
-
await installPackages
|
|
313
|
+
await tracer.startActiveSpan("installPackages", async (span) => {
|
|
314
|
+
await installPackages(cwd, logger);
|
|
315
|
+
span.end();
|
|
316
|
+
});
|
|
287
317
|
}
|
|
288
318
|
|
|
289
319
|
if (hasPackageChanged || uploadFirst) {
|
|
290
320
|
logger.info(
|
|
291
321
|
`Uploading local files to branch '${applicationConfig.branchName}' on server before starting`,
|
|
292
322
|
);
|
|
293
|
-
await
|
|
294
|
-
|
|
323
|
+
await tracer.startActiveSpan(
|
|
324
|
+
"uploadFirstOrPackageChanged",
|
|
325
|
+
async (span) => {
|
|
326
|
+
await syncService!.uploadDirectory();
|
|
327
|
+
await syncService!.uploadDirectoryNowIfNeeded();
|
|
328
|
+
span.end();
|
|
329
|
+
},
|
|
330
|
+
);
|
|
295
331
|
}
|
|
296
332
|
|
|
297
333
|
if (hasCliUpdated) {
|
|
@@ -312,16 +348,23 @@ export async function dev(options: {
|
|
|
312
348
|
logger.info("Skipping directory sync");
|
|
313
349
|
}
|
|
314
350
|
|
|
315
|
-
const httpServer = await
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
351
|
+
const httpServer = await tracer.startActiveSpan(
|
|
352
|
+
"createDevServer",
|
|
353
|
+
async (span) => {
|
|
354
|
+
const result = await createDevServer({
|
|
355
|
+
root: options.cwd,
|
|
356
|
+
mode: "development",
|
|
357
|
+
port: port,
|
|
358
|
+
fsOperationQueue,
|
|
359
|
+
syncService,
|
|
360
|
+
lockService,
|
|
361
|
+
aiService,
|
|
362
|
+
logger: options.logger,
|
|
363
|
+
});
|
|
364
|
+
span.end();
|
|
365
|
+
return result;
|
|
366
|
+
},
|
|
367
|
+
);
|
|
325
368
|
|
|
326
369
|
options.signal?.addEventListener("abort", () => {
|
|
327
370
|
logger.info("Server closed");
|