@superblocksteam/sdk 2.0.69-next.0 → 2.0.69-next.2
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/.turbo/turbo-build.log +1 -1
- package/dist/cli-replacement/dev.d.mts +1 -1
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/dev-utils/dev-server.d.mts +1 -1
- package/dist/dev-utils/dev-server.d.mts.map +1 -1
- package/dist/telemetry/logging.d.ts +4 -4
- package/dist/telemetry/logging.d.ts.map +1 -1
- package/dist/telemetry/logging.js +6 -13
- package/dist/telemetry/logging.js.map +1 -1
- package/package.json +7 -7
- package/src/cli-replacement/dev.mts +1 -1
- package/src/dev-utils/dev-server.mts +1 -1
- package/src/telemetry/logging.ts +20 -23
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/telemetry/safe-stringify.d.ts +0 -2
- package/dist/telemetry/safe-stringify.d.ts.map +0 -1
- package/dist/telemetry/safe-stringify.js +0 -23
- package/dist/telemetry/safe-stringify.js.map +0 -1
- package/src/telemetry/safe-stringify.ts +0 -23
- package/test/safe-stringify.test.mts +0 -18
package/.turbo/turbo-build.log
CHANGED
|
@@ -14,7 +14,7 @@ export declare function dev(options: {
|
|
|
14
14
|
applicationConfig: ApplicationConfig;
|
|
15
15
|
tokenConfig: TokenConfig;
|
|
16
16
|
superblocksPath?: string;
|
|
17
|
-
logger?: (...messages:
|
|
17
|
+
logger?: (...messages: (string | Error)[]) => void;
|
|
18
18
|
autoUpgradeMode?: DevServerAutoUpgradeMode;
|
|
19
19
|
signal?: AbortSignal;
|
|
20
20
|
tokenManager: TokenManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,iBAAiB,EAEjB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AA6L3B,oBAAY,wBAAwB;IAClC,IAAI,iBAAiB;IACrB,KAAK,kBAAkB;CACxB;AAED,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;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAGzB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,iBAAiB,EAEjB,WAAW,EACZ,MAAM,mBAAmB,CAAC;AA6L3B,oBAAY,wBAAwB;IAClC,IAAI,iBAAiB;IACrB,KAAK,kBAAkB;CACxB;AAED,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;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,WAAW,CAAC;IAGzB,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,wBAAwB,CAAC;IAG3C,MAAM,CAAC,EAAE,WAAW,CAAC;IAGrB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,GAAG,EAAE,cAAc,CAAC;CACrB,iBAkVA"}
|
|
@@ -13,7 +13,7 @@ interface CreateDevServerOptions {
|
|
|
13
13
|
syncService?: SyncService;
|
|
14
14
|
lockService?: LockService;
|
|
15
15
|
aiService?: AiService;
|
|
16
|
-
logger?: (
|
|
16
|
+
logger?: (message: string) => void;
|
|
17
17
|
sdk?: SuperblocksSdk;
|
|
18
18
|
}
|
|
19
19
|
export declare function createDevServer({ root, mode, fsOperationQueue, syncService, lockService, aiService, logger: loggerOverride, port, sdk, }: CreateDevServerOptions): Promise<http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAEvF,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAMlC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA6CpC,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,cAAc,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,MAAM,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAEvF,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAMlC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA6CpC,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,cAAc,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,GAAG,CAAC,EAAE,cAAc,CAAC;CACtB;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,MAAM,EAAE,cAAc,EACtB,IAAI,EACJ,GAAG,GACJ,EAAE,sBAAsB,iFA8YxB"}
|
|
@@ -6,12 +6,12 @@ interface ErrorMeta {
|
|
|
6
6
|
};
|
|
7
7
|
}
|
|
8
8
|
export interface Logger {
|
|
9
|
-
debug: (...messages:
|
|
10
|
-
info: (...messages:
|
|
11
|
-
warn: (...messages:
|
|
9
|
+
debug: (...messages: string[]) => void;
|
|
10
|
+
info: (...messages: string[]) => void;
|
|
11
|
+
warn: (...messages: string[]) => void;
|
|
12
12
|
error: (message: string, meta?: ErrorMeta) => void;
|
|
13
13
|
}
|
|
14
|
-
export declare function getLogger(loggerOverride?: (...messages:
|
|
14
|
+
export declare function getLogger(loggerOverride?: (...messages: string[]) => void): Logger;
|
|
15
15
|
export declare function getErrorMeta(error: unknown): ErrorMeta;
|
|
16
16
|
export {};
|
|
17
17
|
//# sourceMappingURL=logging.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"AA+CA,UAAU,SAAS;IACjB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;CACpD;AA+CD,wBAAgB,SAAS,CACvB,cAAc,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GAC/C,MAAM,CAWR;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAgBtD"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { SeverityNumber } from "@opentelemetry/api-logs";
|
|
2
2
|
import { createLogger, format, transports } from "winston";
|
|
3
|
-
import { safeStringify } from "./safe-stringify.js";
|
|
4
3
|
import { getLogger as getTracedLogger } from "./index.js";
|
|
5
4
|
const activeTransports = [];
|
|
6
5
|
if (process.env.SUPERBLOCKS_IS_CSB === "true") {
|
|
@@ -30,36 +29,30 @@ const winstonLogger = createLogger({
|
|
|
30
29
|
format: format.json(),
|
|
31
30
|
transports: activeTransports,
|
|
32
31
|
});
|
|
33
|
-
function formatMessages(messages) {
|
|
34
|
-
return messages.map(safeStringify).join(" ");
|
|
35
|
-
}
|
|
36
32
|
const logger = Object.freeze({
|
|
37
33
|
debug: (...messages) => {
|
|
38
|
-
const body = formatMessages(messages);
|
|
39
34
|
getTracedLogger().emit({
|
|
40
35
|
severityNumber: SeverityNumber.DEBUG,
|
|
41
36
|
severityText: "DEBUG",
|
|
42
|
-
body,
|
|
37
|
+
body: messages.length > 0 ? messages.join(" ") : messages[0],
|
|
43
38
|
});
|
|
44
|
-
winstonLogger.debug(
|
|
39
|
+
winstonLogger.debug(messages.length > 0 ? messages.join(" ") : messages[0]);
|
|
45
40
|
},
|
|
46
41
|
info: (...messages) => {
|
|
47
|
-
const body = formatMessages(messages);
|
|
48
42
|
getTracedLogger().emit({
|
|
49
43
|
severityNumber: SeverityNumber.INFO,
|
|
50
44
|
severityText: "INFO",
|
|
51
|
-
body,
|
|
45
|
+
body: messages.length > 0 ? messages.join(" ") : messages[0],
|
|
52
46
|
});
|
|
53
|
-
winstonLogger.info(
|
|
47
|
+
winstonLogger.info(messages.length > 0 ? messages.join(" ") : messages[0]);
|
|
54
48
|
},
|
|
55
49
|
warn: (...messages) => {
|
|
56
|
-
const body = formatMessages(messages);
|
|
57
50
|
getTracedLogger().emit({
|
|
58
51
|
severityNumber: SeverityNumber.WARN,
|
|
59
52
|
severityText: "WARN",
|
|
60
|
-
body,
|
|
53
|
+
body: messages.length > 0 ? messages.join(" ") : messages[0],
|
|
61
54
|
});
|
|
62
|
-
winstonLogger.warn(
|
|
55
|
+
winstonLogger.warn(messages.length > 0 ? messages.join(" ") : messages[0]);
|
|
63
56
|
},
|
|
64
57
|
error: (message, meta) => {
|
|
65
58
|
getTracedLogger().emit({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/telemetry/logging.ts"],"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.69-next.
|
|
3
|
+
"version": "2.0.69-next.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Superblocks JS SDK",
|
|
6
6
|
"homepage": "https://www.superblocks.com",
|
|
@@ -54,16 +54,16 @@
|
|
|
54
54
|
"semver": "^7.5.4",
|
|
55
55
|
"simple-git": "^3.20.0",
|
|
56
56
|
"slugify": "^1.6.6",
|
|
57
|
-
"vite": "6.
|
|
57
|
+
"vite": "6.3.6",
|
|
58
58
|
"vite-tsconfig-paths": "^5.1.4",
|
|
59
59
|
"winston": "^3.17.0",
|
|
60
60
|
"ws": "^8.17.0",
|
|
61
61
|
"yaml": "^2.7.1",
|
|
62
|
-
"@superblocksteam/library": "2.0.69-next.
|
|
63
|
-
"@superblocksteam/library-shared": "2.0.69-next.
|
|
64
|
-
"@superblocksteam/shared": "v0.
|
|
65
|
-
"@superblocksteam/util": "2.0.69-next.
|
|
66
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.69-next.
|
|
62
|
+
"@superblocksteam/library": "2.0.69-next.2",
|
|
63
|
+
"@superblocksteam/library-shared": "2.0.69-next.2",
|
|
64
|
+
"@superblocksteam/shared": "v0.9551.6",
|
|
65
|
+
"@superblocksteam/util": "2.0.69-next.2",
|
|
66
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.69-next.2"
|
|
67
67
|
},
|
|
68
68
|
"optionalDependencies": {
|
|
69
69
|
"@rollup/rollup-darwin-arm64": "^4.34.9",
|
|
@@ -248,7 +248,7 @@ export async function dev(options: {
|
|
|
248
248
|
/* For debugging purposes to get location of the cli */
|
|
249
249
|
superblocksPath?: string;
|
|
250
250
|
/* For redirecting output, like when running outside of the CLI */
|
|
251
|
-
logger?: (...messages:
|
|
251
|
+
logger?: (...messages: (string | Error)[]) => void;
|
|
252
252
|
|
|
253
253
|
/* Optionally force auto-upgrade (for testing purposes), or skip it for a child process when restarting the dev server for automatic upgrades */
|
|
254
254
|
autoUpgradeMode?: DevServerAutoUpgradeMode;
|
|
@@ -94,7 +94,7 @@ interface CreateDevServerOptions {
|
|
|
94
94
|
lockService?: LockService;
|
|
95
95
|
aiService?: AiService;
|
|
96
96
|
/* For redirecting output, like when running outside of the CLI */
|
|
97
|
-
logger?: (
|
|
97
|
+
logger?: (message: string) => void;
|
|
98
98
|
sdk?: SuperblocksSdk;
|
|
99
99
|
}
|
|
100
100
|
|
package/src/telemetry/logging.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { SeverityNumber } from "@opentelemetry/api-logs";
|
|
2
2
|
import { createLogger, format, transports } from "winston";
|
|
3
|
-
import { safeStringify } from "./safe-stringify.js";
|
|
4
3
|
import { getLogger as getTracedLogger } from "./index.js";
|
|
5
4
|
import type { AnyValueMap } from "@opentelemetry/api-logs";
|
|
6
5
|
import type winston from "winston";
|
|
@@ -55,43 +54,41 @@ interface ErrorMeta {
|
|
|
55
54
|
}
|
|
56
55
|
|
|
57
56
|
export interface Logger {
|
|
58
|
-
debug: (...messages:
|
|
59
|
-
info: (...messages:
|
|
60
|
-
warn: (...messages:
|
|
57
|
+
debug: (...messages: string[]) => void;
|
|
58
|
+
info: (...messages: string[]) => void;
|
|
59
|
+
warn: (...messages: string[]) => void;
|
|
61
60
|
error: (message: string, meta?: ErrorMeta) => void;
|
|
62
61
|
}
|
|
63
|
-
|
|
64
|
-
function formatMessages(messages: unknown[]): string {
|
|
65
|
-
return messages.map(safeStringify).join(" ");
|
|
66
|
-
}
|
|
67
|
-
|
|
68
62
|
const logger: Logger = Object.freeze({
|
|
69
|
-
debug: (...messages:
|
|
70
|
-
const body = formatMessages(messages);
|
|
63
|
+
debug: (...messages: string[]) => {
|
|
71
64
|
getTracedLogger().emit({
|
|
72
65
|
severityNumber: SeverityNumber.DEBUG,
|
|
73
66
|
severityText: "DEBUG",
|
|
74
|
-
body,
|
|
67
|
+
body: messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
75
68
|
});
|
|
76
|
-
winstonLogger.debug(
|
|
69
|
+
winstonLogger.debug(
|
|
70
|
+
messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
71
|
+
);
|
|
77
72
|
},
|
|
78
|
-
info: (...messages:
|
|
79
|
-
const body = formatMessages(messages);
|
|
73
|
+
info: (...messages: string[]) => {
|
|
80
74
|
getTracedLogger().emit({
|
|
81
75
|
severityNumber: SeverityNumber.INFO,
|
|
82
76
|
severityText: "INFO",
|
|
83
|
-
body,
|
|
77
|
+
body: messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
84
78
|
});
|
|
85
|
-
winstonLogger.info(
|
|
79
|
+
winstonLogger.info(
|
|
80
|
+
messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
81
|
+
);
|
|
86
82
|
},
|
|
87
|
-
warn: (...messages:
|
|
88
|
-
const body = formatMessages(messages);
|
|
83
|
+
warn: (...messages: string[]) => {
|
|
89
84
|
getTracedLogger().emit({
|
|
90
85
|
severityNumber: SeverityNumber.WARN,
|
|
91
86
|
severityText: "WARN",
|
|
92
|
-
body,
|
|
87
|
+
body: messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
93
88
|
});
|
|
94
|
-
winstonLogger.warn(
|
|
89
|
+
winstonLogger.warn(
|
|
90
|
+
messages.length > 0 ? messages.join(" ") : (messages[0] as string),
|
|
91
|
+
);
|
|
95
92
|
},
|
|
96
93
|
error: (message: string, meta?: ErrorMeta) => {
|
|
97
94
|
getTracedLogger().emit({
|
|
@@ -109,7 +106,7 @@ const logger: Logger = Object.freeze({
|
|
|
109
106
|
});
|
|
110
107
|
|
|
111
108
|
export function getLogger(
|
|
112
|
-
loggerOverride?: (...messages:
|
|
109
|
+
loggerOverride?: (...messages: string[]) => void,
|
|
113
110
|
): Logger {
|
|
114
111
|
if (!loggerOverride) {
|
|
115
112
|
return logger;
|
|
@@ -119,7 +116,7 @@ export function getLogger(
|
|
|
119
116
|
debug: loggerOverride,
|
|
120
117
|
info: loggerOverride,
|
|
121
118
|
warn: loggerOverride,
|
|
122
|
-
error: loggerOverride as
|
|
119
|
+
error: loggerOverride as any,
|
|
123
120
|
};
|
|
124
121
|
}
|
|
125
122
|
|