@dcl/sdk-commands 7.5.7-9891810625.commit-d9f5cf2 → 7.5.7
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/dist/commands/start/data-layer/rpc.js.map +1 -1
- package/dist/commands/start/explorer-alpha.d.ts +9 -0
- package/dist/commands/start/explorer-alpha.js +27 -0
- package/dist/commands/start/explorer-alpha.js.map +1 -0
- package/dist/commands/start/index.d.ts +2 -3
- package/dist/commands/start/index.js +36 -36
- package/dist/commands/start/index.js.map +1 -1
- package/dist/commands/start/server/file-watch-notifier.d.ts +6 -1
- package/dist/commands/start/server/file-watch-notifier.js +62 -10
- package/dist/commands/start/server/file-watch-notifier.js.map +1 -1
- package/dist/commands/start/server/ws.js.map +1 -1
- package/dist/logic/bundle.js +9 -5
- package/dist/logic/bundle.js.map +1 -1
- package/package.json +5 -6
- package/dist/logic/dao-explorer.d.ts +0 -3
- package/dist/logic/dao-explorer.js +0 -154
- package/dist/logic/dao-explorer.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/commands/start/data-layer/rpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA6F;AAC7F,kCAAoE;AACpE,+DAAgD;AAGhD,6BAA+D;AAOxD,KAAK,UAAU,eAAe,CAAC,UAAgD;IACpF,MAAM,EAAE,GAAG,IAAA,6CAAwC,EAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1E,MAAM,aAAa,GAAG,MAAM,IAAA,+BAAmB,EAAC,EAAE,CAAC,CAAA;IACnD,MAAM,OAAO,GAAqB;QAChC,EAAE;QACF,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAA;
|
|
1
|
+
{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/commands/start/data-layer/rpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA6F;AAC7F,kCAAoE;AACpE,+DAAgD;AAGhD,6BAA+D;AAOxD,KAAK,UAAU,eAAe,CAAC,UAAgD;IACpF,MAAM,EAAE,GAAG,IAAA,6CAAwC,EAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;IAC1E,MAAM,aAAa,GAAG,MAAM,IAAA,+BAAmB,EAAC,EAAE,CAAC,CAAA;IACnD,MAAM,OAAO,GAAqB;QAChC,EAAE;QACF,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAA;IAED,MAAM,SAAS,GAAG,IAAA,qBAAe,EAAmB,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAElF,SAAS,CAAC,UAAU,CAAC,KAAK,UAAU,UAAU,CAAC,UAA2C;QACxF,OAAO,CAAC,eAAe,CAAC,UAAU,EAAE,iCAAqB,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IAC7G,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAA;AAC/B,CAAC;AAfD,0CAeC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runExplorerAlpha = void 0;
|
|
4
|
+
const isWindows = /^win/.test(process.platform);
|
|
5
|
+
async function runExplorerAlpha(components, opts) {
|
|
6
|
+
const { cwd, realm, baseCoords } = opts;
|
|
7
|
+
if (await runApp(components, { cwd, realm, baseCoords })) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
components.logger.log('Please download & install the Decentraland Desktop Client: https://dcl.gg/explorer\n\n');
|
|
11
|
+
}
|
|
12
|
+
exports.runExplorerAlpha = runExplorerAlpha;
|
|
13
|
+
async function runApp(components, { cwd, realm, baseCoords }) {
|
|
14
|
+
const cmd = isWindows ? 'start' : 'open';
|
|
15
|
+
try {
|
|
16
|
+
const params = `realm=${realm}&position=${baseCoords.x},${baseCoords.y}&local-scene=true`;
|
|
17
|
+
const app = `decentraland://"${params}"`;
|
|
18
|
+
await components.spawner.exec(cwd, cmd, [app], { silent: true });
|
|
19
|
+
components.logger.info(`Desktop client: decentraland://${params}\n`);
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
catch (e) {
|
|
23
|
+
components.logger.error('Decentraland Desktop Client failed with: ', e.message);
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=explorer-alpha.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"explorer-alpha.js","sourceRoot":"","sources":["../../../src/commands/start/explorer-alpha.ts"],"names":[],"mappings":";;;AAEA,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;AAExC,KAAK,UAAU,gBAAgB,CACpC,UAAyB,EACzB,IAA0E;IAE1E,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IAEvC,IAAI,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE;QACxD,OAAM;KACP;IAED,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,wFAAwF,CAAC,CAAA;AACjH,CAAC;AAXD,4CAWC;AAED,KAAK,UAAU,MAAM,CACnB,UAAyB,EACzB,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAwE;IAEhG,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;IACxC,IAAI;QACF,MAAM,MAAM,GAAG,SAAS,KAAK,aAAa,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,mBAAmB,CAAA;QACzF,MAAM,GAAG,GAAG,mBAAmB,MAAM,GAAG,CAAA;QACxC,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAChE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,MAAM,IAAI,CAAC,CAAA;QACpE,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAM,EAAE;QACf,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;QAC/E,OAAO,KAAK,CAAA;KACb;AACH,CAAC"}
|
|
@@ -20,10 +20,9 @@ export declare const args: {
|
|
|
20
20
|
'-b': string;
|
|
21
21
|
'-w': string;
|
|
22
22
|
'--skip-build': BooleanConstructor;
|
|
23
|
-
'--
|
|
23
|
+
'--desktop-client': BooleanConstructor;
|
|
24
24
|
'--data-layer': BooleanConstructor;
|
|
25
|
-
'-
|
|
26
|
-
'--customEntryPoint': BooleanConstructor;
|
|
25
|
+
'--explorer-alpha': BooleanConstructor;
|
|
27
26
|
};
|
|
28
27
|
export declare function help(options: Options): Promise<void>;
|
|
29
28
|
export declare function main(options: Options): Promise<void>;
|
|
@@ -51,7 +51,7 @@ const exit_signal_1 = require("../../components/exit-signal");
|
|
|
51
51
|
const workspace_validations_1 = require("../../logic/workspace-validations");
|
|
52
52
|
const beautiful_logs_1 = require("../../logic/beautiful-logs");
|
|
53
53
|
const project_validations_1 = require("../../logic/project-validations");
|
|
54
|
-
const
|
|
54
|
+
const explorer_alpha_1 = require("./explorer-alpha");
|
|
55
55
|
exports.args = (0, args_1.declareArgs)({
|
|
56
56
|
'--dir': String,
|
|
57
57
|
'--help': Boolean,
|
|
@@ -68,10 +68,9 @@ exports.args = (0, args_1.declareArgs)({
|
|
|
68
68
|
'-b': '--no-browser',
|
|
69
69
|
'-w': '--no-watch',
|
|
70
70
|
'--skip-build': Boolean,
|
|
71
|
-
'--
|
|
71
|
+
'--desktop-client': Boolean,
|
|
72
72
|
'--data-layer': Boolean,
|
|
73
|
-
'-
|
|
74
|
-
'--customEntryPoint': Boolean
|
|
73
|
+
'--explorer-alpha': Boolean
|
|
75
74
|
});
|
|
76
75
|
async function help(options) {
|
|
77
76
|
options.components.logger.log(`
|
|
@@ -106,17 +105,14 @@ async function main(options) {
|
|
|
106
105
|
const workingDirectory = path.resolve(process.cwd(), options.args['--dir'] || '.');
|
|
107
106
|
const isCi = options.args['--ci'] || process.env.CI || false;
|
|
108
107
|
const debug = !options.args['--no-debug'] && !isCi;
|
|
109
|
-
const
|
|
110
|
-
const openBrowser = (!experimentalDaoExplorer || !options.args['--no-browser']) && !isCi && !experimentalDaoExplorer;
|
|
108
|
+
const openBrowser = !options.args['--no-browser'] && !isCi;
|
|
111
109
|
const build = !options.args['--skip-build'];
|
|
112
110
|
const watch = !options.args['--no-watch'];
|
|
113
111
|
const withDataLayer = options.args['--data-layer'];
|
|
114
112
|
const enableWeb3 = options.args['--web3'];
|
|
113
|
+
const explorerAlpha = options.args['--explorer-alpha'];
|
|
115
114
|
let hasSmartWearable = false;
|
|
116
115
|
const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
|
|
117
|
-
if (experimentalDaoExplorer) {
|
|
118
|
-
await (0, dao_explorer_1.ensureDaoExplorer)(options.components, workspace.rootWorkingDirectory);
|
|
119
|
-
}
|
|
120
116
|
/* istanbul ignore if */
|
|
121
117
|
if (workspace.projects.length > 1)
|
|
122
118
|
(0, beautiful_logs_1.printWarning)(options.components.logger, 'Support for multiple projects is still experimental.');
|
|
@@ -128,15 +124,7 @@ async function main(options) {
|
|
|
128
124
|
// first run `npm run build`, this can be disabled with --skip-build
|
|
129
125
|
// then start the embedded compiler, this can be disabled with --no-watch
|
|
130
126
|
if (watch || build) {
|
|
131
|
-
await (0, build_1.buildScene)({
|
|
132
|
-
...options,
|
|
133
|
-
args: {
|
|
134
|
-
'--dir': project.workingDirectory,
|
|
135
|
-
'--watch': watch,
|
|
136
|
-
_: [],
|
|
137
|
-
'--customEntryPoint': !!options.args['--customEntryPoint']
|
|
138
|
-
}
|
|
139
|
-
}, project);
|
|
127
|
+
await (0, build_1.buildScene)({ ...options, args: { '--dir': project.workingDirectory, '--watch': watch, _: [] } }, project);
|
|
140
128
|
await (0, project_validations_1.startValidations)(options.components, project.workingDirectory);
|
|
141
129
|
}
|
|
142
130
|
// track the event
|
|
@@ -161,7 +149,7 @@ async function main(options) {
|
|
|
161
149
|
});
|
|
162
150
|
const logs = await (0, logger_1.createConsoleLogComponent)({});
|
|
163
151
|
const ws = await (0, ws_1.createWsComponent)({ logs });
|
|
164
|
-
const server = await (0, http_server_1.createServerComponent)({ config,
|
|
152
|
+
const server = await (0, http_server_1.createServerComponent)({ config, ws: ws.ws, logs }, { cors: {} });
|
|
165
153
|
const rooms = await (0, rooms_1.createRoomsComponent)({
|
|
166
154
|
metrics,
|
|
167
155
|
logs,
|
|
@@ -194,49 +182,61 @@ async function main(options) {
|
|
|
194
182
|
await (0, routes_1.wireRouter)(components, workspace, dataLayer);
|
|
195
183
|
if (watch) {
|
|
196
184
|
for (const project of workspace.projects) {
|
|
197
|
-
await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, project.workingDirectory, project.kind);
|
|
185
|
+
await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, project.workingDirectory, project.kind, !!explorerAlpha);
|
|
198
186
|
}
|
|
199
187
|
}
|
|
200
188
|
await startComponents();
|
|
201
189
|
const networkInterfaces = os.networkInterfaces();
|
|
202
190
|
const availableURLs = [];
|
|
203
191
|
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, 'Preview server is now running!');
|
|
204
|
-
|
|
192
|
+
if (!explorerAlpha) {
|
|
193
|
+
components.logger.log('Available on:\n');
|
|
194
|
+
}
|
|
205
195
|
Object.keys(networkInterfaces).forEach((dev) => {
|
|
206
196
|
;
|
|
207
197
|
(networkInterfaces[dev] || []).forEach((details) => {
|
|
208
198
|
if (details.family === 'IPv4') {
|
|
209
199
|
const oldBackpack = 'DISABLE_backpack_editor_v2=&ENABLE_backpack_editor_v1';
|
|
210
|
-
|
|
211
|
-
let url = `${baseUrl}?position=${baseCoords.x}%2C${baseCoords.y}&${oldBackpack}`;
|
|
200
|
+
let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&${oldBackpack}`;
|
|
212
201
|
if (debug) {
|
|
213
|
-
|
|
202
|
+
addr = `${addr}&SCENE_DEBUG_PANEL`;
|
|
214
203
|
}
|
|
215
204
|
if (enableWeb3 || hasSmartWearable) {
|
|
216
|
-
|
|
205
|
+
addr = `${addr}&ENABLE_WEB3`;
|
|
217
206
|
}
|
|
218
|
-
availableURLs.push(
|
|
207
|
+
availableURLs.push(addr);
|
|
219
208
|
}
|
|
220
209
|
});
|
|
221
210
|
});
|
|
222
211
|
// Push localhost and 127.0.0.1 at top
|
|
223
212
|
const sortedURLs = availableURLs.sort((a, _b) => {
|
|
224
|
-
return a.
|
|
225
|
-
? -1
|
|
226
|
-
: 1;
|
|
213
|
+
return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1;
|
|
227
214
|
});
|
|
228
|
-
|
|
229
|
-
|
|
215
|
+
if (!explorerAlpha) {
|
|
216
|
+
for (const addr of sortedURLs) {
|
|
217
|
+
components.logger.log(` ${addr}`);
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
if (options.args['--desktop-client']) {
|
|
221
|
+
components.logger.log('\n Desktop client:\n');
|
|
222
|
+
for (const addr of sortedURLs) {
|
|
223
|
+
const searchParams = new URLSearchParams();
|
|
224
|
+
searchParams.append('PREVIEW-MODE', addr);
|
|
225
|
+
components.logger.log(` dcl://${searchParams.toString()}&`);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
if (!explorerAlpha) {
|
|
229
|
+
components.logger.log('\n Details:\n');
|
|
230
230
|
}
|
|
231
|
-
components.logger.log('\n Details:\n');
|
|
232
231
|
components.logger.log('\nPress CTRL+C to exit\n');
|
|
233
|
-
if (
|
|
234
|
-
|
|
232
|
+
if (explorerAlpha) {
|
|
233
|
+
const realm = new URL(sortedURLs[0]).origin;
|
|
234
|
+
await (0, explorer_alpha_1.runExplorerAlpha)(components, { cwd: workingDirectory, realm, baseCoords });
|
|
235
235
|
}
|
|
236
236
|
// Open preferably localhost/127.0.0.1
|
|
237
|
-
if (openBrowser && sortedURLs.length) {
|
|
237
|
+
if (!explorerAlpha && openBrowser && sortedURLs.length && !options.args['--desktop-client']) {
|
|
238
238
|
try {
|
|
239
|
-
await (0, open_1.default)(sortedURLs[0]
|
|
239
|
+
await (0, open_1.default)(sortedURLs[0]);
|
|
240
240
|
}
|
|
241
241
|
catch (_) {
|
|
242
242
|
components.logger.warn('Unable to open browser automatically.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAC5B,gDAAuB;AAGvB,oCAAqC;AACrC,2CAA8C;AAC9C,qEAA6D;AAC7D,6DAAmD;AAEnD,4DAA2E;AAC3E,kEAA6D;AAC7D,oFAAwF;AACxF,+DAAwF;AACxF,oEAA0E;AAC1E,0DAAyE;AACzE,8CAAuD;AACvD,8CAA4D;AAC5D,sEAA0E;AAC1E,4CAA4C;AAC5C,oCAA+C;AAC/C,6DAA8D;AAC9D,0CAA6D;AAC7D,8DAAwE;AACxE,6EAAqE;AACrE,+DAAyG;AAEzG,yEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/start/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { WebSocket } from 'ws';
|
|
1
2
|
import { PreviewComponents } from '../types';
|
|
2
3
|
import { ProjectUnion } from '../../../logic/project-validations';
|
|
3
4
|
/**
|
|
@@ -6,4 +7,8 @@ import { ProjectUnion } from '../../../logic/project-validations';
|
|
|
6
7
|
*
|
|
7
8
|
* IMPORTANT: this is a legacy protocol and needs to be revisited for SDK7
|
|
8
9
|
*/
|
|
9
|
-
export declare function wireFileWatcherToWebSockets(components: Pick<PreviewComponents, 'fs' | 'ws'>, projectRoot: string, projectKind: ProjectUnion['kind']): Promise<void>;
|
|
10
|
+
export declare function wireFileWatcherToWebSockets(components: Pick<PreviewComponents, 'fs' | 'ws'>, projectRoot: string, projectKind: ProjectUnion['kind'], desktopClient: boolean): Promise<void>;
|
|
11
|
+
/**
|
|
12
|
+
* @deprecated old explorer (kernel)
|
|
13
|
+
*/
|
|
14
|
+
export declare function __LEGACY__updateScene(dir: string, clients: Set<WebSocket>, projectKind: ProjectUnion['kind']): void;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.wireFileWatcherToWebSockets = void 0;
|
|
6
|
+
exports.__LEGACY__updateScene = exports.wireFileWatcherToWebSockets = void 0;
|
|
7
7
|
const schemas_1 = require("@dcl/schemas");
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const ws_1 = require("ws");
|
|
@@ -11,6 +11,7 @@ const chokidar_1 = __importDefault(require("chokidar"));
|
|
|
11
11
|
const dcl_ignore_1 = require("../../../logic/dcl-ignore");
|
|
12
12
|
const routes_1 = require("./routes");
|
|
13
13
|
const project_files_1 = require("../../../logic/project-files");
|
|
14
|
+
const local_development_gen_1 = require("@dcl/protocol/out-js/decentraland/sdk/development/local_development.gen");
|
|
14
15
|
function debounce(callback, delay) {
|
|
15
16
|
let debounceTimer;
|
|
16
17
|
return (...args) => {
|
|
@@ -24,33 +25,84 @@ function debounce(callback, delay) {
|
|
|
24
25
|
*
|
|
25
26
|
* IMPORTANT: this is a legacy protocol and needs to be revisited for SDK7
|
|
26
27
|
*/
|
|
27
|
-
async function wireFileWatcherToWebSockets(components, projectRoot, projectKind) {
|
|
28
|
+
async function wireFileWatcherToWebSockets(components, projectRoot, projectKind, desktopClient) {
|
|
28
29
|
const ignored = await (0, dcl_ignore_1.getDCLIgnorePatterns)(components, projectRoot);
|
|
30
|
+
const sceneId = (0, project_files_1.b64HashingFunction)(projectRoot);
|
|
29
31
|
chokidar_1.default
|
|
30
32
|
.watch(path_1.default.resolve(projectRoot), {
|
|
33
|
+
atomic: false,
|
|
31
34
|
ignored,
|
|
32
35
|
ignoreInitial: false,
|
|
33
36
|
cwd: projectRoot
|
|
34
37
|
})
|
|
35
|
-
.on('
|
|
36
|
-
|
|
37
|
-
|
|
38
|
+
.on('unlink', (_, file) => {
|
|
39
|
+
if (desktopClient) {
|
|
40
|
+
return removeModel(sceneId, file);
|
|
41
|
+
}
|
|
42
|
+
})
|
|
43
|
+
.on('all', debounce(async (a, file) => {
|
|
44
|
+
if (desktopClient) {
|
|
45
|
+
updateScene(sceneId, file);
|
|
46
|
+
}
|
|
47
|
+
return __LEGACY__updateScene(projectRoot, routes_1.sceneUpdateClients, projectKind);
|
|
38
48
|
}, 500));
|
|
39
49
|
}
|
|
40
50
|
exports.wireFileWatcherToWebSockets = wireFileWatcherToWebSockets;
|
|
41
|
-
|
|
42
|
-
|
|
51
|
+
function isGLTFModel(file) {
|
|
52
|
+
if (!file)
|
|
53
|
+
return false;
|
|
54
|
+
return file.toLowerCase().endsWith('.glb') || file.toLowerCase().endsWith('.gltf');
|
|
55
|
+
}
|
|
56
|
+
function updateScene(sceneId, file) {
|
|
57
|
+
let message;
|
|
58
|
+
if (isGLTFModel(file)) {
|
|
59
|
+
message = {
|
|
60
|
+
$case: 'updateModel',
|
|
61
|
+
updateModel: { hash: (0, project_files_1.b64HashingFunction)(file), sceneId, src: file, type: local_development_gen_1.UpdateModelType.UMT_CHANGE }
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
message = {
|
|
66
|
+
$case: 'updateScene',
|
|
67
|
+
updateScene: { sceneId }
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
sendSceneMessage({ message });
|
|
71
|
+
}
|
|
72
|
+
function removeModel(sceneId, file) {
|
|
73
|
+
if (isGLTFModel(file)) {
|
|
74
|
+
const sceneMessage = {
|
|
75
|
+
message: {
|
|
76
|
+
$case: 'updateModel',
|
|
77
|
+
updateModel: { sceneId, src: file, hash: (0, project_files_1.b64HashingFunction)(file), type: local_development_gen_1.UpdateModelType.UMT_REMOVE }
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
sendSceneMessage(sceneMessage);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function sendSceneMessage(sceneMessage) {
|
|
84
|
+
const message = local_development_gen_1.WsSceneMessage.encode(sceneMessage).finish();
|
|
85
|
+
for (const client of routes_1.sceneUpdateClients) {
|
|
86
|
+
if (client.readyState === ws_1.WebSocket.OPEN) {
|
|
87
|
+
client.send(message, { binary: true });
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* @deprecated old explorer (kernel)
|
|
43
93
|
*/
|
|
44
|
-
function
|
|
94
|
+
function __LEGACY__updateScene(dir, clients, projectKind) {
|
|
45
95
|
for (const client of clients) {
|
|
46
96
|
if (client.readyState === ws_1.WebSocket.OPEN) {
|
|
47
97
|
const message = {
|
|
48
98
|
type: schemas_1.sdk.SCENE_UPDATE,
|
|
49
99
|
payload: { sceneId: (0, project_files_1.b64HashingFunction)(dir), sceneType: projectKind }
|
|
50
100
|
};
|
|
51
|
-
|
|
52
|
-
client.send(
|
|
101
|
+
// Old explorer
|
|
102
|
+
client.send(schemas_1.sdk.UPDATE, { binary: false });
|
|
103
|
+
client.send(JSON.stringify(message), { binary: false });
|
|
53
104
|
}
|
|
54
105
|
}
|
|
55
106
|
}
|
|
107
|
+
exports.__LEGACY__updateScene = __LEGACY__updateScene;
|
|
56
108
|
//# sourceMappingURL=file-watch-notifier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watch-notifier.js","sourceRoot":"","sources":["../../../../src/commands/start/server/file-watch-notifier.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAkC;AAClC,gDAAuB;AACvB,2BAA8B;AAC9B,wDAA+B;AAC/B,0DAAgE;AAEhE,qCAA6C;AAE7C,gEAAiE;
|
|
1
|
+
{"version":3,"file":"file-watch-notifier.js","sourceRoot":"","sources":["../../../../src/commands/start/server/file-watch-notifier.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAkC;AAClC,gDAAuB;AACvB,2BAA8B;AAC9B,wDAA+B;AAC/B,0DAAgE;AAEhE,qCAA6C;AAE7C,gEAAiE;AACjE,mHAGgF;AAEhF,SAAS,QAAQ,CAAqC,QAAW,EAAE,KAAa;IAC9E,IAAI,aAA6B,CAAA;IACjC,OAAO,CAAC,GAAG,IAAmB,EAAE,EAAE;QAChC,YAAY,CAAC,aAAa,CAAC,CAAA;QAC3B,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAA;IAC5D,CAAC,CAAA;AACH,CAAC;AACD;;;;;GAKG;AACI,KAAK,UAAU,2BAA2B,CAC/C,UAAgD,EAChD,WAAmB,EACnB,WAAiC,EACjC,aAAsB;IAEtB,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAoB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAA;IACnE,MAAM,OAAO,GAAG,IAAA,kCAAkB,EAAC,WAAW,CAAC,CAAA;IAC/C,kBAAQ;SACL,KAAK,CAAC,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAChC,MAAM,EAAE,KAAK;QACb,OAAO;QACP,aAAa,EAAE,KAAK;QACpB,GAAG,EAAE,WAAW;KACjB,CAAC;SACD,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAU,EAAE,IAAY,EAAE,EAAE;QACzC,IAAI,aAAa,EAAE;YACjB,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;SAClC;IACH,CAAC,CAAC;SACD,EAAE,CACD,KAAK,EACL,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QACzB,IAAI,aAAa,EAAE;YACjB,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;SAC3B;QACD,OAAO,qBAAqB,CAAC,WAAW,EAAE,2BAAkB,EAAE,WAAW,CAAC,CAAA;IAC5E,CAAC,EAAE,GAAG,CAAC,CACR,CAAA;AACL,CAAC;AA7BD,kEA6BC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAA;IACvB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;AACpF,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,IAAY;IAChD,IAAI,OAAkC,CAAA;IACtC,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE;QACrB,OAAO,GAAG;YACR,KAAK,EAAE,aAAa;YACpB,WAAW,EAAE,EAAE,IAAI,EAAE,IAAA,kCAAkB,EAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,uCAAe,CAAC,UAAU,EAAE;SACtG,CAAA;KACF;SAAM;QACL,OAAO,GAAG;YACR,KAAK,EAAE,aAAa;YACpB,WAAW,EAAE,EAAE,OAAO,EAAE;SACzB,CAAA;KACF;IACD,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,IAAY;IAChD,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE;QACrB,MAAM,YAAY,GAAmB;YACnC,OAAO,EAAE;gBACP,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAA,kCAAkB,EAAC,IAAI,CAAC,EAAE,IAAI,EAAE,uCAAe,CAAC,UAAU,EAAE;aACtG;SACF,CAAA;QAED,gBAAgB,CAAC,YAAY,CAAC,CAAA;KAC/B;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,YAA4B;IACpD,MAAM,OAAO,GAAG,sCAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAA;IAC5D,KAAK,MAAM,MAAM,IAAI,2BAAkB,EAAE;QACvC,IAAI,MAAM,CAAC,UAAU,KAAK,cAAS,CAAC,IAAI,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;SACvC;KACF;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,GAAW,EAAE,OAAuB,EAAE,WAAiC;IAC3G,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,UAAU,KAAK,cAAS,CAAC,IAAI,EAAE;YACxC,MAAM,OAAO,GAAoB;gBAC/B,IAAI,EAAE,aAAG,CAAC,YAAY;gBACtB,OAAO,EAAE,EAAE,OAAO,EAAE,IAAA,kCAAkB,EAAC,GAAG,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE;aACtE,CAAA;YAED,eAAe;YACf,MAAM,CAAC,IAAI,CAAC,aAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;YAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;SACxD;KACF;AACH,CAAC;AAbD,sDAaC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../../../src/commands/start/server/ws.ts"],"names":[],"mappings":";;;AAAA,2BAAoC;AAQpC;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,CAAkC;IACxE,MAAM,EAAE,GAAG,IAAI,oBAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../../../src/commands/start/server/ws.ts"],"names":[],"mappings":";;;AAAA,2BAAoC;AAQpC;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,CAAkC;IACxE,MAAM,EAAE,GAAG,IAAI,oBAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,KAAK,UAAU,IAAI;QACjB,EAAE,CAAC,KAAK,EAAE,CAAA;IACZ,CAAC;IAED,OAAO;QACL,IAAI;QACJ,EAAE;KACH,CAAA;AACH,CAAC;AAVD,8CAUC"}
|
package/dist/logic/bundle.js
CHANGED
|
@@ -59,11 +59,16 @@ for (const path in compositeFromLoader) {
|
|
|
59
59
|
|
|
60
60
|
if ((entrypoint as any).main !== undefined) {
|
|
61
61
|
function _INTERNAL_startup_system() {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
maybePromise
|
|
62
|
+
try {
|
|
63
|
+
const maybePromise = (entrypoint as any).main()
|
|
64
|
+
if (maybePromise && typeof maybePromise === 'object' && typeof (maybePromise as unknown as Promise<unknown>).then === 'function') {
|
|
65
|
+
maybePromise.catch(console.error)
|
|
66
|
+
}
|
|
67
|
+
} catch (e) {
|
|
68
|
+
console.error(e)
|
|
69
|
+
} finally {
|
|
70
|
+
engine.removeSystem(_INTERNAL_startup_system)
|
|
65
71
|
}
|
|
66
|
-
engine.removeSystem(_INTERNAL_startup_system)
|
|
67
72
|
}
|
|
68
73
|
engine.addSystem(_INTERNAL_startup_system, Infinity)
|
|
69
74
|
}
|
|
@@ -237,7 +242,6 @@ function compositeLoader(components, options) {
|
|
|
237
242
|
(0, beautiful_logs_1.printWarning)(components.logger, 'Some composites are not included because of errors while compiling them. There can be unexpected behavior in the scene, check the errors and try to fix them.');
|
|
238
243
|
}
|
|
239
244
|
else if (!lastBuiltSuccessful) {
|
|
240
|
-
components.logger.log('Composites built without errors.');
|
|
241
245
|
}
|
|
242
246
|
lastBuiltSuccessful = !data.withErrors;
|
|
243
247
|
}
|
package/dist/logic/bundle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/logic/bundle.ts"],"names":[],"mappings":";AAAA,6EAA6E;AAC7E,4EAA4E;;;;;;AAG5E,kEAAyC;AACzC,sDAA6B;AAC7B,yCAAkC;AAClC,+BAA+B;AAC/B,gDAAuB;AACvB,6BAAmC;AAEnC,2CAA0C;AAC1C,qDAAqF;AACrF,mCAAkC;AAClC,2CAA8C;AAC9C,+DAAqD;AA0BrD,MAAM,QAAQ,GAAG,CAAC,CAAA;AAElB;;;;;GAKG;AAEH,SAAS,iBAAiB,CAAC,cAAsB,EAAE,iBAA0B,EAAE,gBAAyB,KAAK;IAC3G,MAAM,kBAAkB,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC/D,IAAI,iBAAiB;QAAE,OAAO,gCAAgC,kBAAkB,GAAG,CAAA;IAEnF,OAAO;;+BAEsB,kBAAkB;;;;;;EAO/C,aAAa;QACb;;;;;;;;;;;;;;;;;;EAmBF
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/logic/bundle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk-commands",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.5.7
|
|
4
|
+
"version": "7.5.7",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"bin": {
|
|
7
7
|
"sdk-commands": "./dist/index.js"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@dcl/crypto": "^3.4.4",
|
|
11
|
-
"@dcl/ecs": "7.5.7
|
|
11
|
+
"@dcl/ecs": "7.5.7",
|
|
12
12
|
"@dcl/hashing": "1.1.3",
|
|
13
|
-
"@dcl/inspector": "7.5.7
|
|
13
|
+
"@dcl/inspector": "7.5.7",
|
|
14
14
|
"@dcl/linker-dapp": "^0.12.0",
|
|
15
15
|
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
|
|
16
|
-
"@dcl/protocol": "1.0.0-
|
|
16
|
+
"@dcl/protocol": "1.0.0-10670971402.commit-227b327",
|
|
17
17
|
"@dcl/quests-client": "^1.0.3",
|
|
18
18
|
"@dcl/quests-manager": "^0.1.4",
|
|
19
19
|
"@dcl/rpc": "^1.1.1",
|
|
@@ -38,7 +38,6 @@
|
|
|
38
38
|
"open": "^8.4.0",
|
|
39
39
|
"portfinder": "^1.0.32",
|
|
40
40
|
"prompts": "^2.4.2",
|
|
41
|
-
"tar": "^7.1.0",
|
|
42
41
|
"typescript": "^5.0.2",
|
|
43
42
|
"undici": "^5.19.1",
|
|
44
43
|
"uuid": "^9.0.1"
|
|
@@ -74,5 +73,5 @@
|
|
|
74
73
|
"displayName": "SDK",
|
|
75
74
|
"tsconfig": "./tsconfig.json"
|
|
76
75
|
},
|
|
77
|
-
"commit": "
|
|
76
|
+
"commit": "bc3c487938573c47cc154a97be8b1742628c0d69"
|
|
78
77
|
}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import { CliComponents } from '../components';
|
|
2
|
-
export declare function ensureDaoExplorer(components: Pick<CliComponents, 'logger' | 'fs' | 'fetch'>, workingDirectory: string): Promise<void>;
|
|
3
|
-
export declare function runDaoExplorer(components: Pick<CliComponents, 'logger' | 'fs' | 'fetch'>, realmUrl: string, locationCoords: string, workingDirectory: string): void;
|
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.runDaoExplorer = exports.ensureDaoExplorer = void 0;
|
|
30
|
-
const fs_1 = require("./fs");
|
|
31
|
-
const path_1 = __importDefault(require("path"));
|
|
32
|
-
const os_1 = require("os");
|
|
33
|
-
const error_1 = require("./error");
|
|
34
|
-
const beautiful_logs_1 = require("./beautiful-logs");
|
|
35
|
-
const tar = __importStar(require("tar"));
|
|
36
|
-
const child_process_1 = __importDefault(require("child_process"));
|
|
37
|
-
var SupportedPlatform;
|
|
38
|
-
(function (SupportedPlatform) {
|
|
39
|
-
SupportedPlatform[SupportedPlatform["SP_MACOS_ARM64"] = 0] = "SP_MACOS_ARM64";
|
|
40
|
-
SupportedPlatform[SupportedPlatform["SP_MACOS_X64"] = 1] = "SP_MACOS_X64";
|
|
41
|
-
SupportedPlatform[SupportedPlatform["SP_LINUX_X64"] = 2] = "SP_LINUX_X64";
|
|
42
|
-
SupportedPlatform[SupportedPlatform["SP_WINDOWS_X64"] = 3] = "SP_WINDOWS_X64";
|
|
43
|
-
SupportedPlatform[SupportedPlatform["SP_UNSUPPORTED"] = 4] = "SP_UNSUPPORTED";
|
|
44
|
-
})(SupportedPlatform || (SupportedPlatform = {}));
|
|
45
|
-
const BEVY_BASE_URL = 'https://github.com/decentraland/bevy-explorer/releases/download/alpha-2024-06-27-14-58-56/bevy-explorer-2024-06-27-14-58-56';
|
|
46
|
-
const BEVY_URL_PLATFORM_SUFFIX = {
|
|
47
|
-
[SupportedPlatform.SP_LINUX_X64]: 'linux-x86_64.tar.gz',
|
|
48
|
-
[SupportedPlatform.SP_MACOS_ARM64]: 'macos-m1m2.tar.gz',
|
|
49
|
-
[SupportedPlatform.SP_MACOS_X64]: 'macos-x86_64.tar.gz',
|
|
50
|
-
[SupportedPlatform.SP_WINDOWS_X64]: 'windows-x86_64.zip',
|
|
51
|
-
[SupportedPlatform.SP_UNSUPPORTED]: 'empty'
|
|
52
|
-
};
|
|
53
|
-
function getPlatform() {
|
|
54
|
-
const os = (0, os_1.platform)();
|
|
55
|
-
const arch = process.arch;
|
|
56
|
-
switch (os) {
|
|
57
|
-
case 'darwin':
|
|
58
|
-
if (arch === 'arm64') {
|
|
59
|
-
return SupportedPlatform.SP_MACOS_ARM64;
|
|
60
|
-
}
|
|
61
|
-
else if (arch === 'x64') {
|
|
62
|
-
return SupportedPlatform.SP_MACOS_ARM64;
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
|
66
|
-
}
|
|
67
|
-
case 'win32':
|
|
68
|
-
if (arch === 'x64') {
|
|
69
|
-
return SupportedPlatform.SP_WINDOWS_X64;
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
|
73
|
-
}
|
|
74
|
-
case 'linux':
|
|
75
|
-
if (arch === 'x64') {
|
|
76
|
-
return SupportedPlatform.SP_LINUX_X64;
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
|
80
|
-
}
|
|
81
|
-
default:
|
|
82
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
function getDaoExplorerPath(workingDirectory) {
|
|
86
|
-
return path_1.default.resolve(workingDirectory, 'node_modules', '.bin', 'dao-explorer');
|
|
87
|
-
}
|
|
88
|
-
function getDaoExplorerExecutablePath(workingDirectory) {
|
|
89
|
-
const platform = getPlatform();
|
|
90
|
-
if (platform === SupportedPlatform.SP_UNSUPPORTED) {
|
|
91
|
-
throw new error_1.CliError('This platform is not supported to run the DAO Explorers.');
|
|
92
|
-
}
|
|
93
|
-
if (platform === SupportedPlatform.SP_WINDOWS_X64) {
|
|
94
|
-
return path_1.default.resolve(getDaoExplorerPath(workingDirectory), 'decentra-bevy.exe');
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
return path_1.default.resolve(getDaoExplorerPath(workingDirectory), 'decentra-bevy');
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
async function ensureDaoExplorer(components, workingDirectory) {
|
|
101
|
-
const daoExplorerFolderPath = getDaoExplorerPath(workingDirectory);
|
|
102
|
-
const platform = getPlatform();
|
|
103
|
-
if (platform === SupportedPlatform.SP_UNSUPPORTED) {
|
|
104
|
-
throw new error_1.CliError('This platform is not supported to run the DAO Explorers.');
|
|
105
|
-
}
|
|
106
|
-
const url = `${BEVY_BASE_URL}-${BEVY_URL_PLATFORM_SUFFIX[platform]}`;
|
|
107
|
-
const versionFilePath = path_1.default.resolve(daoExplorerFolderPath, 'version');
|
|
108
|
-
if (await components.fs.fileExists(versionFilePath)) {
|
|
109
|
-
const versionContent = await components.fs.readFile(versionFilePath, 'utf-8');
|
|
110
|
-
if (versionContent === url) {
|
|
111
|
-
return;
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
const tempPackagePath = path_1.default.resolve(daoExplorerFolderPath, BEVY_URL_PLATFORM_SUFFIX[platform]);
|
|
115
|
-
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Downloading DAO Explorer ${BEVY_URL_PLATFORM_SUFFIX[platform]} from ${url}`);
|
|
116
|
-
if (await components.fs.directoryExists(daoExplorerFolderPath)) {
|
|
117
|
-
await components.fs.rm(daoExplorerFolderPath, { recursive: true, force: true });
|
|
118
|
-
}
|
|
119
|
-
await components.fs.mkdir(daoExplorerFolderPath, { recursive: true });
|
|
120
|
-
await (0, fs_1.download)(components, url, tempPackagePath);
|
|
121
|
-
if (tempPackagePath.endsWith('.zip')) {
|
|
122
|
-
await (0, fs_1.extract)(tempPackagePath, daoExplorerFolderPath);
|
|
123
|
-
}
|
|
124
|
-
else if (tempPackagePath.endsWith('.tar.gz') || tempPackagePath.endsWith('.tgz')) {
|
|
125
|
-
await tar.extract({
|
|
126
|
-
C: daoExplorerFolderPath,
|
|
127
|
-
f: tempPackagePath
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
await components.fs.writeFile(versionFilePath, url);
|
|
131
|
-
}
|
|
132
|
-
exports.ensureDaoExplorer = ensureDaoExplorer;
|
|
133
|
-
function runDaoExplorer(components, realmUrl, locationCoords, workingDirectory) {
|
|
134
|
-
const daoExplorerFolderPath = getDaoExplorerPath(workingDirectory);
|
|
135
|
-
const executablePath = getDaoExplorerExecutablePath(workingDirectory);
|
|
136
|
-
executablePath;
|
|
137
|
-
const ts = child_process_1.default.spawn(executablePath, ['--preview', '--server', realmUrl, '--location', locationCoords], {
|
|
138
|
-
env: process.env,
|
|
139
|
-
cwd: daoExplorerFolderPath
|
|
140
|
-
});
|
|
141
|
-
ts.on('close', (code) => {
|
|
142
|
-
/* istanbul ignore else */
|
|
143
|
-
if (code === 0) {
|
|
144
|
-
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Type checking completed without errors`);
|
|
145
|
-
}
|
|
146
|
-
else {
|
|
147
|
-
return;
|
|
148
|
-
}
|
|
149
|
-
});
|
|
150
|
-
ts.stdout.pipe(process.stdout);
|
|
151
|
-
ts.stderr.pipe(process.stderr);
|
|
152
|
-
}
|
|
153
|
-
exports.runDaoExplorer = runDaoExplorer;
|
|
154
|
-
//# sourceMappingURL=dao-explorer.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"dao-explorer.js","sourceRoot":"","sources":["../../src/logic/dao-explorer.ts"],"names":[],"mappings":"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"}
|