@dcl/sdk-commands 7.6.5-11859795746.commit-4bc5ec9 → 7.6.5-11861605587.commit-c13aef2
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.
@@ -20,10 +20,8 @@ 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
|
-
'-e': string;
|
26
|
-
'--customEntryPoint': BooleanConstructor;
|
27
25
|
'--explorer-alpha': BooleanConstructor;
|
28
26
|
'--hub': BooleanConstructor;
|
29
27
|
};
|
@@ -51,7 +51,6 @@ 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 dao_explorer_1 = require("../../logic/dao-explorer");
|
55
54
|
const explorer_alpha_1 = require("./explorer-alpha");
|
56
55
|
exports.args = (0, args_1.declareArgs)({
|
57
56
|
'--dir': String,
|
@@ -69,10 +68,8 @@ exports.args = (0, args_1.declareArgs)({
|
|
69
68
|
'-b': '--no-browser',
|
70
69
|
'-w': '--no-watch',
|
71
70
|
'--skip-build': Boolean,
|
72
|
-
'--
|
71
|
+
'--desktop-client': Boolean,
|
73
72
|
'--data-layer': Boolean,
|
74
|
-
'-e': '--no-dao-explorer',
|
75
|
-
'--customEntryPoint': Boolean,
|
76
73
|
'--explorer-alpha': Boolean,
|
77
74
|
'--hub': Boolean
|
78
75
|
});
|
@@ -109,8 +106,7 @@ async function main(options) {
|
|
109
106
|
const workingDirectory = path.resolve(process.cwd(), options.args['--dir'] || '.');
|
110
107
|
const isCi = options.args['--ci'] || process.env.CI || false;
|
111
108
|
const debug = !options.args['--no-debug'] && !isCi;
|
112
|
-
const
|
113
|
-
const openBrowser = (!experimentalDaoExplorer || !options.args['--no-browser']) && !isCi && !experimentalDaoExplorer;
|
109
|
+
const openBrowser = !options.args['--no-browser'] && !isCi;
|
114
110
|
const build = !options.args['--skip-build'];
|
115
111
|
const watch = !options.args['--no-watch'];
|
116
112
|
const withDataLayer = options.args['--data-layer'];
|
@@ -119,9 +115,6 @@ async function main(options) {
|
|
119
115
|
const isHub = !!options.args['--hub'];
|
120
116
|
let hasSmartWearable = false;
|
121
117
|
const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
|
122
|
-
if (experimentalDaoExplorer) {
|
123
|
-
await (0, dao_explorer_1.ensureDaoExplorer)(options.components, workspace.rootWorkingDirectory);
|
124
|
-
}
|
125
118
|
/* istanbul ignore if */
|
126
119
|
if (workspace.projects.length > 1)
|
127
120
|
(0, beautiful_logs_1.printWarning)(options.components.logger, 'Support for multiple projects is still experimental.');
|
@@ -133,15 +126,7 @@ async function main(options) {
|
|
133
126
|
// first run `npm run build`, this can be disabled with --skip-build
|
134
127
|
// then start the embedded compiler, this can be disabled with --no-watch
|
135
128
|
if (watch || build) {
|
136
|
-
await (0, build_1.buildScene)({
|
137
|
-
...options,
|
138
|
-
args: {
|
139
|
-
'--dir': project.workingDirectory,
|
140
|
-
'--watch': watch,
|
141
|
-
_: [],
|
142
|
-
'--customEntryPoint': !!options.args['--customEntryPoint']
|
143
|
-
}
|
144
|
-
}, project);
|
129
|
+
await (0, build_1.buildScene)({ ...options, args: { '--dir': project.workingDirectory, '--watch': watch, _: [] } }, project);
|
145
130
|
await (0, project_validations_1.startValidations)(options.components, project.workingDirectory);
|
146
131
|
}
|
147
132
|
// track the event
|
@@ -214,45 +199,46 @@ async function main(options) {
|
|
214
199
|
(networkInterfaces[dev] || []).forEach((details) => {
|
215
200
|
if (details.family === 'IPv4') {
|
216
201
|
const oldBackpack = 'DISABLE_backpack_editor_v2=&ENABLE_backpack_editor_v1';
|
217
|
-
|
218
|
-
let url = `${baseUrl}?position=${baseCoords.x}%2C${baseCoords.y}&${oldBackpack}`;
|
202
|
+
let addr = `http://${details.address}:${port}?position=${baseCoords.x}%2C${baseCoords.y}&${oldBackpack}`;
|
219
203
|
if (debug) {
|
220
|
-
|
204
|
+
addr = `${addr}&SCENE_DEBUG_PANEL`;
|
221
205
|
}
|
222
206
|
if (enableWeb3 || hasSmartWearable) {
|
223
|
-
|
207
|
+
addr = `${addr}&ENABLE_WEB3`;
|
224
208
|
}
|
225
|
-
availableURLs.push(
|
209
|
+
availableURLs.push(addr);
|
226
210
|
}
|
227
211
|
});
|
228
212
|
});
|
229
213
|
// Push localhost and 127.0.0.1 at top
|
230
214
|
const sortedURLs = availableURLs.sort((a, _b) => {
|
231
|
-
return a.
|
232
|
-
? -1
|
233
|
-
: 1;
|
215
|
+
return a.toLowerCase().includes('localhost') || a.includes('127.0.0.1') || a.includes('0.0.0.0') ? -1 : 1;
|
234
216
|
});
|
235
217
|
if (!explorerAlpha) {
|
236
218
|
for (const addr of sortedURLs) {
|
237
219
|
components.logger.log(` ${addr}`);
|
238
220
|
}
|
239
221
|
}
|
222
|
+
if (options.args['--desktop-client']) {
|
223
|
+
components.logger.log('\n Desktop client:\n');
|
224
|
+
for (const addr of sortedURLs) {
|
225
|
+
const searchParams = new URLSearchParams();
|
226
|
+
searchParams.append('PREVIEW-MODE', addr);
|
227
|
+
components.logger.log(` dcl://${searchParams.toString()}&`);
|
228
|
+
}
|
229
|
+
}
|
240
230
|
if (!explorerAlpha) {
|
241
231
|
components.logger.log('\n Details:\n');
|
242
232
|
}
|
243
233
|
components.logger.log('\nPress CTRL+C to exit\n');
|
244
|
-
if (experimentalDaoExplorer && sortedURLs.length) {
|
245
|
-
(0, dao_explorer_1.runDaoExplorer)(components, sortedURLs[0].base, `${baseCoords.x},${baseCoords.y}`, workingDirectory);
|
246
|
-
}
|
247
|
-
// Open preferably localhost/127.0.0.1
|
248
234
|
if (explorerAlpha) {
|
249
|
-
const realm = new URL(sortedURLs[0]
|
235
|
+
const realm = new URL(sortedURLs[0]).origin;
|
250
236
|
await (0, explorer_alpha_1.runExplorerAlpha)(components, { cwd: workingDirectory, realm, baseCoords, isHub });
|
251
237
|
}
|
252
238
|
// Open preferably localhost/127.0.0.1
|
253
|
-
if (!explorerAlpha && openBrowser && sortedURLs.length) {
|
239
|
+
if (!explorerAlpha && openBrowser && sortedURLs.length && !options.args['--desktop-client']) {
|
254
240
|
try {
|
255
|
-
await (0, open_1.default)(sortedURLs[0]
|
241
|
+
await (0, open_1.default)(sortedURLs[0]);
|
256
242
|
}
|
257
243
|
catch (_) {
|
258
244
|
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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"}
|
package/package.json
CHANGED
@@ -1,19 +1,19 @@
|
|
1
1
|
{
|
2
2
|
"name": "@dcl/sdk-commands",
|
3
3
|
"description": "",
|
4
|
-
"version": "7.6.5-
|
4
|
+
"version": "7.6.5-11861605587.commit-c13aef2",
|
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.6.5-
|
11
|
+
"@dcl/ecs": "7.6.5-11861605587.commit-c13aef2",
|
12
12
|
"@dcl/hashing": "1.1.3",
|
13
|
-
"@dcl/inspector": "7.6.5-
|
13
|
+
"@dcl/inspector": "7.6.5-11861605587.commit-c13aef2",
|
14
14
|
"@dcl/linker-dapp": "^0.14.2",
|
15
15
|
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
|
16
|
-
"@dcl/protocol": "1.0.0-
|
16
|
+
"@dcl/protocol": "1.0.0-11599848164.commit-ef74edc",
|
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"
|
@@ -57,9 +56,6 @@
|
|
57
56
|
"keywords": [],
|
58
57
|
"license": "Apache-2.0",
|
59
58
|
"minCliVersion": "3.14.1",
|
60
|
-
"overrides": {
|
61
|
-
"@dcl/protocol": "1.0.0-11858567019.commit-f8ad8ea"
|
62
|
-
},
|
63
59
|
"repository": {
|
64
60
|
"url": "git+https://github.com/decentraland/js-sdk-toolchain",
|
65
61
|
"directory": "packages/@dcl/sdk-commands"
|
@@ -77,5 +73,5 @@
|
|
77
73
|
"displayName": "SDK",
|
78
74
|
"tsconfig": "./tsconfig.json"
|
79
75
|
},
|
80
|
-
"commit": "
|
76
|
+
"commit": "c13aef29bb1b519384e6667b91dc8a7b40822663"
|
81
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,156 +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_LINUX_X64"] = 1] = "SP_LINUX_X64";
|
41
|
-
SupportedPlatform[SupportedPlatform["SP_WINDOWS_X64"] = 2] = "SP_WINDOWS_X64";
|
42
|
-
SupportedPlatform[SupportedPlatform["SP_UNSUPPORTED"] = 3] = "SP_UNSUPPORTED";
|
43
|
-
})(SupportedPlatform || (SupportedPlatform = {}));
|
44
|
-
const BEVY_BASE_URL = 'https://github.com/decentraland/bevy-explorer/releases/download/alpha-2024-11-12-18-52-59/bevy-explorer-2024-11-12-18-52-59';
|
45
|
-
const BEVY_URL_PLATFORM_SUFFIX = {
|
46
|
-
[SupportedPlatform.SP_LINUX_X64]: 'linux-x86_64.tar.gz',
|
47
|
-
[SupportedPlatform.SP_MACOS_ARM64]: 'macos-m1m2.zip',
|
48
|
-
[SupportedPlatform.SP_WINDOWS_X64]: 'windows-x86_64.zip',
|
49
|
-
[SupportedPlatform.SP_UNSUPPORTED]: 'empty'
|
50
|
-
};
|
51
|
-
function getPlatform() {
|
52
|
-
const os = (0, os_1.platform)();
|
53
|
-
const arch = process.arch;
|
54
|
-
switch (os) {
|
55
|
-
case 'darwin':
|
56
|
-
if (arch === 'arm64') {
|
57
|
-
return SupportedPlatform.SP_MACOS_ARM64;
|
58
|
-
}
|
59
|
-
else {
|
60
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
61
|
-
}
|
62
|
-
case 'win32':
|
63
|
-
if (arch === 'x64') {
|
64
|
-
return SupportedPlatform.SP_WINDOWS_X64;
|
65
|
-
}
|
66
|
-
else {
|
67
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
68
|
-
}
|
69
|
-
case 'linux':
|
70
|
-
if (arch === 'x64') {
|
71
|
-
return SupportedPlatform.SP_LINUX_X64;
|
72
|
-
}
|
73
|
-
else {
|
74
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
75
|
-
}
|
76
|
-
default:
|
77
|
-
return SupportedPlatform.SP_UNSUPPORTED;
|
78
|
-
}
|
79
|
-
}
|
80
|
-
function getDaoExplorerPath(workingDirectory) {
|
81
|
-
// Reliable way to get the path to get the first active node_module folder
|
82
|
-
const sdkPath = require.resolve('@dcl/sdk');
|
83
|
-
if (sdkPath !== null) {
|
84
|
-
// SDK-path is something like /node_modules/@dcl/sdk/index.js
|
85
|
-
return path_1.default.resolve(sdkPath, '..', '..', '..', '.bin', 'dao-explorer');
|
86
|
-
}
|
87
|
-
return path_1.default.resolve(workingDirectory, 'node_modules', '.bin', 'dao-explorer');
|
88
|
-
}
|
89
|
-
function getDaoExplorerExecutablePath(workingDirectory) {
|
90
|
-
const platform = getPlatform();
|
91
|
-
if (platform === SupportedPlatform.SP_UNSUPPORTED) {
|
92
|
-
throw new error_1.CliError('This platform is not supported to run the DAO Explorers.');
|
93
|
-
}
|
94
|
-
if (platform === SupportedPlatform.SP_WINDOWS_X64) {
|
95
|
-
return path_1.default.resolve(getDaoExplorerPath(workingDirectory), 'decentra-bevy.exe');
|
96
|
-
}
|
97
|
-
if (platform === SupportedPlatform.SP_MACOS_ARM64) {
|
98
|
-
return path_1.default.resolve(getDaoExplorerPath(workingDirectory), 'DecentralandBevyExplorer.app/Contents/MacOS/DecentralandBevyExplorer');
|
99
|
-
}
|
100
|
-
return path_1.default.resolve(getDaoExplorerPath(workingDirectory), 'decentra-bevy');
|
101
|
-
}
|
102
|
-
async function ensureDaoExplorer(components, workingDirectory) {
|
103
|
-
const daoExplorerFolderPath = getDaoExplorerPath(workingDirectory);
|
104
|
-
const platform = getPlatform();
|
105
|
-
if (platform === SupportedPlatform.SP_UNSUPPORTED) {
|
106
|
-
throw new error_1.CliError('This platform is not supported to run the DAO Explorers.');
|
107
|
-
}
|
108
|
-
const url = `${BEVY_BASE_URL}-${BEVY_URL_PLATFORM_SUFFIX[platform]}`;
|
109
|
-
const versionFilePath = path_1.default.resolve(daoExplorerFolderPath, 'version');
|
110
|
-
if (await components.fs.fileExists(versionFilePath)) {
|
111
|
-
const versionContent = await components.fs.readFile(versionFilePath, 'utf-8');
|
112
|
-
if (versionContent === url) {
|
113
|
-
return;
|
114
|
-
}
|
115
|
-
}
|
116
|
-
const tempPackagePath = path_1.default.resolve(daoExplorerFolderPath, BEVY_URL_PLATFORM_SUFFIX[platform]);
|
117
|
-
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Downloading DAO Explorer ${BEVY_URL_PLATFORM_SUFFIX[platform]} from ${url}`);
|
118
|
-
if (await components.fs.directoryExists(daoExplorerFolderPath)) {
|
119
|
-
await components.fs.rm(daoExplorerFolderPath, { recursive: true, force: true });
|
120
|
-
}
|
121
|
-
await components.fs.mkdir(daoExplorerFolderPath, { recursive: true });
|
122
|
-
await (0, fs_1.download)(components, url, tempPackagePath);
|
123
|
-
if (tempPackagePath.endsWith('.zip')) {
|
124
|
-
await (0, fs_1.extract)(tempPackagePath, daoExplorerFolderPath);
|
125
|
-
}
|
126
|
-
else if (tempPackagePath.endsWith('.tar.gz') || tempPackagePath.endsWith('.tgz')) {
|
127
|
-
await tar.extract({
|
128
|
-
C: daoExplorerFolderPath,
|
129
|
-
f: tempPackagePath
|
130
|
-
});
|
131
|
-
}
|
132
|
-
await components.fs.writeFile(versionFilePath, url);
|
133
|
-
}
|
134
|
-
exports.ensureDaoExplorer = ensureDaoExplorer;
|
135
|
-
function runDaoExplorer(components, realmUrl, locationCoords, workingDirectory) {
|
136
|
-
const daoExplorerFolderPath = getDaoExplorerPath(workingDirectory);
|
137
|
-
const executablePath = getDaoExplorerExecutablePath(workingDirectory);
|
138
|
-
executablePath;
|
139
|
-
const ts = child_process_1.default.spawn(executablePath, ['--preview', '--server', realmUrl, '--location', locationCoords], {
|
140
|
-
env: process.env,
|
141
|
-
cwd: daoExplorerFolderPath
|
142
|
-
});
|
143
|
-
ts.on('close', (code) => {
|
144
|
-
/* istanbul ignore else */
|
145
|
-
if (code === 0) {
|
146
|
-
(0, beautiful_logs_1.printProgressInfo)(components.logger, `Type checking completed without errors`);
|
147
|
-
}
|
148
|
-
else {
|
149
|
-
return;
|
150
|
-
}
|
151
|
-
});
|
152
|
-
ts.stdout.pipe(process.stdout);
|
153
|
-
ts.stderr.pipe(process.stderr);
|
154
|
-
}
|
155
|
-
exports.runDaoExplorer = runDaoExplorer;
|
156
|
-
//# 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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"}
|