@dcl/sdk-commands 7.5.8-10777738407.commit-ecf90a0 → 7.5.8-10819179502.commit-e2e6cc5
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/deploy/index.js +2 -4
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/deploy/utils.js +4 -3
- package/dist/commands/deploy/utils.js.map +1 -1
- package/dist/commands/quests/utils.js +5 -6
- package/dist/commands/quests/utils.js.map +1 -1
- package/dist/linker-dapp/routes.d.ts +3 -2
- package/dist/linker-dapp/routes.js +56 -0
- package/dist/linker-dapp/routes.js.map +1 -1
- package/package.json +5 -5
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.main = exports.help = exports.args = void 0;
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const schemas_1 = require("@dcl/schemas");
|
|
9
|
-
const crypto_1 = require("@dcl/crypto");
|
|
10
9
|
const dcl_catalyst_client_1 = require("dcl-catalyst-client");
|
|
11
10
|
const fp_future_1 = __importDefault(require("fp-future"));
|
|
12
11
|
const scene_validations_1 = require("../../logic/scene-validations");
|
|
@@ -117,8 +116,7 @@ async function main(options) {
|
|
|
117
116
|
void program?.stop();
|
|
118
117
|
}
|
|
119
118
|
async function deployEntity(linkerResponse) {
|
|
120
|
-
const {
|
|
121
|
-
const authChain = crypto_1.Authenticator.createSimpleAuthChain(entityId, address, signature);
|
|
119
|
+
const { authChain, chainId } = linkerResponse;
|
|
122
120
|
// Uploading data
|
|
123
121
|
const { client, url } = await (0, utils_1.getCatalyst)(chainId, options.args['--target'], options.args['--target-content']);
|
|
124
122
|
(0, beautiful_logs_1.printProgressInfo)(options.components.logger, `Uploading data to: ${url}...`);
|
|
@@ -130,7 +128,7 @@ async function main(options) {
|
|
|
130
128
|
const sceneUrl = `${domain}/?NETWORK=${network}&position=${position}${worldRealm}`;
|
|
131
129
|
try {
|
|
132
130
|
options.components.logger.info(`Address: ${linkerResponse.address}`);
|
|
133
|
-
options.components.logger.info(`
|
|
131
|
+
options.components.logger.info(`AuthChain: ${linkerResponse.authChain}`);
|
|
134
132
|
options.components.logger.info(`Network: ${(0, schemas_1.getChainName)(linkerResponse.chainId)}`);
|
|
135
133
|
const response = (await client.deploy(deployData, {
|
|
136
134
|
timeout: 600000
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA8B;AAC9B,0CAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const contracts_snapshots_1 = require("dcl-catalyst-client/dist/contracts-snapsh
|
|
|
7
7
|
const fetch_component_1 = require("@well-known-components/fetch-component");
|
|
8
8
|
const eth_connect_1 = require("eth-connect");
|
|
9
9
|
const crypto_1 = require("@dcl/crypto/dist/crypto");
|
|
10
|
+
const crypto_2 = require("@dcl/crypto");
|
|
10
11
|
const routes_1 = require("../../linker-dapp/routes");
|
|
11
12
|
const account_1 = require("../../logic/account");
|
|
12
13
|
const config_1 = require("../../logic/config");
|
|
@@ -50,8 +51,8 @@ exports.getCatalyst = getCatalyst;
|
|
|
50
51
|
async function getAddressAndSignature(components, awaitResponse, messageToSign, scene, files, skipValidations, linkOptions, deployCallback) {
|
|
51
52
|
if (process.env.DCL_PRIVATE_KEY) {
|
|
52
53
|
const wallet = (0, account_1.createWallet)(process.env.DCL_PRIVATE_KEY);
|
|
53
|
-
const
|
|
54
|
-
const linkerResponse = {
|
|
54
|
+
const authChain = crypto_2.Authenticator.createSimpleAuthChain(messageToSign, wallet.address, (0, crypto_1.ethSign)((0, eth_connect_1.hexToBytes)(wallet.privateKey), messageToSign));
|
|
55
|
+
const linkerResponse = { authChain, address: wallet.address };
|
|
55
56
|
await deployCallback(linkerResponse);
|
|
56
57
|
awaitResponse.resolve();
|
|
57
58
|
return {};
|
|
@@ -92,7 +93,7 @@ function setDeployRoutes(router, components, awaitResponse, sceneInfo, files, de
|
|
|
92
93
|
});
|
|
93
94
|
router.post('/api/deploy', async (ctx) => {
|
|
94
95
|
const value = (await ctx.request.json());
|
|
95
|
-
if (!value.address || !value.
|
|
96
|
+
if (!value.address || !value.authChain || !value.chainId) {
|
|
96
97
|
const errorMessage = `Invalid payload: ${Object.keys(value).join(' - ')}`;
|
|
97
98
|
logger.error(errorMessage);
|
|
98
99
|
resolveLinkerPromise();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/deploy/utils.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAE7C,6DAA8G;AAC9G,sFAA0F;AAC1F,4EAA6E;AAC7E,6CAAwC;AACxC,oDAAiD;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/deploy/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,8 @@ const routes_1 = require("../../linker-dapp/routes");
|
|
|
18
18
|
async function getAddressAndSignature(components, linkerOpts, awaitResponse, info, callback) {
|
|
19
19
|
if (process.env.DCL_PRIVATE_KEY) {
|
|
20
20
|
const wallet = (0, account_1.createWallet)(process.env.DCL_PRIVATE_KEY);
|
|
21
|
-
const
|
|
22
|
-
const linkerResponse = {
|
|
21
|
+
const authChain = crypto_2.Authenticator.createSimpleAuthChain(info.messageToSign, wallet.address, (0, crypto_1.ethSign)((0, eth_connect_1.hexToBytes)(wallet.privateKey), info.messageToSign));
|
|
22
|
+
const linkerResponse = { authChain, address: wallet.address };
|
|
23
23
|
await callback(linkerResponse);
|
|
24
24
|
awaitResponse.resolve();
|
|
25
25
|
return {};
|
|
@@ -30,7 +30,7 @@ async function getAddressAndSignature(components, linkerOpts, awaitResponse, inf
|
|
|
30
30
|
const resolveLinkerPromise = () => setTimeout(() => awaitResponse.resolve(), 100);
|
|
31
31
|
router.post('/api/quests', async (ctx) => {
|
|
32
32
|
const value = (await ctx.request.json());
|
|
33
|
-
if (!value.address || !value.
|
|
33
|
+
if (!value.address || !value.authChain) {
|
|
34
34
|
const errorMessage = `Invalid payload: ${Object.keys(value).join(' - ')}`;
|
|
35
35
|
logger.error(errorMessage);
|
|
36
36
|
resolveLinkerPromise();
|
|
@@ -58,7 +58,7 @@ async function executeSubcommand(components, linkerOps, commandData, commandCall
|
|
|
58
58
|
.join(':')
|
|
59
59
|
.toLowerCase();
|
|
60
60
|
const { program } = await getAddressAndSignature(components, linkerOps, awaitResponse, { messageToSign: payload, extraData: commandData.extraData, actionType: commandData.actionType }, async (linkerResponse) => {
|
|
61
|
-
await commandCallback(createAuthchainHeaders(linkerResponse.address, linkerResponse.
|
|
61
|
+
await commandCallback(createAuthchainHeaders(linkerResponse.address, linkerResponse.authChain, payload, timestamp, JSON.stringify(commandData.metadata)));
|
|
62
62
|
});
|
|
63
63
|
try {
|
|
64
64
|
await awaitResponse;
|
|
@@ -207,8 +207,7 @@ exports.createQuestByPrompting = createQuestByPrompting;
|
|
|
207
207
|
const AUTH_CHAIN_HEADER_PREFIX = 'x-identity-auth-chain-';
|
|
208
208
|
const AUTH_TIMESTAMP_HEADER = 'x-identity-timestamp';
|
|
209
209
|
const AUTH_METADATA_HEADER = 'x-identity-metadata';
|
|
210
|
-
function createAuthchainHeaders(address,
|
|
211
|
-
const authchain = crypto_2.Authenticator.createSimpleAuthChain(payload, address, signature);
|
|
210
|
+
function createAuthchainHeaders(address, authchain, payload, timestamp, metadata) {
|
|
212
211
|
const headers = {};
|
|
213
212
|
authchain.forEach((link, i) => {
|
|
214
213
|
headers[AUTH_CHAIN_HEADER_PREFIX + i] = JSON.stringify(link);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/quests/utils.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA2C;AAC3C,oDAAiD;AACjD,6CAAwC;AAExC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/quests/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Router } from '@well-known-components/http-server';
|
|
2
|
-
import { CliComponents } from '../components';
|
|
3
2
|
import { ChainId } from '@dcl/schemas';
|
|
3
|
+
import { AuthChain } from '@dcl/crypto';
|
|
4
|
+
import { CliComponents } from '../components';
|
|
4
5
|
/**
|
|
5
6
|
* Set common routes to use on Linker dApp
|
|
6
7
|
* @param components Server components
|
|
@@ -14,6 +15,6 @@ export declare function setRoutes<T extends {
|
|
|
14
15
|
};
|
|
15
16
|
export interface LinkerResponse {
|
|
16
17
|
address: string;
|
|
17
|
-
|
|
18
|
+
authChain: AuthChain;
|
|
18
19
|
chainId?: ChainId;
|
|
19
20
|
}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.setRoutes = void 0;
|
|
4
7
|
const path_1 = require("path");
|
|
8
|
+
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
|
+
const https_1 = __importDefault(require("https"));
|
|
5
10
|
const http_server_1 = require("@well-known-components/http-server");
|
|
6
11
|
/**
|
|
7
12
|
* Set common routes to use on Linker dApp
|
|
@@ -24,6 +29,45 @@ function setRoutes(components, info, mainRoute = '/') {
|
|
|
24
29
|
body: fs.createReadStream((0, path_1.resolve)(linkerDapp, 'static', ctx.params.type, ctx.params.path))
|
|
25
30
|
};
|
|
26
31
|
});
|
|
32
|
+
router.get('/assets/:path', async (ctx) => {
|
|
33
|
+
const contentType = getContentTypeFromPath(ctx.params.path);
|
|
34
|
+
return {
|
|
35
|
+
headers: { 'Content-Type': contentType },
|
|
36
|
+
body: fs.createReadStream((0, path_1.resolve)(linkerDapp, 'assets', ctx.params.path))
|
|
37
|
+
};
|
|
38
|
+
});
|
|
39
|
+
/* This route acts as a proxy to handle the auth flow with the Decentraland auth dApp,
|
|
40
|
+
* because this latest one validates the communication be on the same domain.
|
|
41
|
+
*/
|
|
42
|
+
router.get('/auth/login', async (ctx) => {
|
|
43
|
+
try {
|
|
44
|
+
const httpsAgent = new https_1.default.Agent({
|
|
45
|
+
rejectUnauthorized: false
|
|
46
|
+
});
|
|
47
|
+
const url = 'https://decentraland.org/auth/login';
|
|
48
|
+
// Forward the incoming request to the Decentraland auth endpoint.
|
|
49
|
+
const resp = await (0, node_fetch_1.default)(url, {
|
|
50
|
+
method: ctx.request.method,
|
|
51
|
+
headers: ctx.request.headers,
|
|
52
|
+
body: ctx.request.body,
|
|
53
|
+
agent: httpsAgent // Use the insecure HTTPS agent.
|
|
54
|
+
});
|
|
55
|
+
// Remove content-encoding header if present to prevent issues with compressed responses.
|
|
56
|
+
resp.headers.delete('content-encoding');
|
|
57
|
+
// Return the proxied response, including body, status, and headers.
|
|
58
|
+
return {
|
|
59
|
+
body: resp.body,
|
|
60
|
+
status: resp.status,
|
|
61
|
+
headers: resp.headers
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
return {
|
|
66
|
+
status: 500,
|
|
67
|
+
body: `Proxy error: ${error instanceof Error ? error.message : error}`
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
});
|
|
27
71
|
router.get('/manifest.json', async () => ({
|
|
28
72
|
headers: { 'Content-Type': 'application/json' },
|
|
29
73
|
body: fs.createReadStream((0, path_1.resolve)(linkerDapp, 'manifest.json'))
|
|
@@ -45,4 +89,16 @@ function getContentType(type) {
|
|
|
45
89
|
return 'text/plain';
|
|
46
90
|
}
|
|
47
91
|
}
|
|
92
|
+
function getContentTypeFromPath(path) {
|
|
93
|
+
const ext = path.split('.').pop();
|
|
94
|
+
switch (ext) {
|
|
95
|
+
case 'css':
|
|
96
|
+
return 'text/css';
|
|
97
|
+
case 'js':
|
|
98
|
+
return 'application/javascript';
|
|
99
|
+
case 'media':
|
|
100
|
+
default:
|
|
101
|
+
return 'text/plain';
|
|
102
|
+
}
|
|
103
|
+
}
|
|
48
104
|
//# sourceMappingURL=routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/linker-dapp/routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/linker-dapp/routes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk-commands",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.5.8-
|
|
4
|
+
"version": "7.5.8-10819179502.commit-e2e6cc5",
|
|
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.8-
|
|
11
|
+
"@dcl/ecs": "7.5.8-10819179502.commit-e2e6cc5",
|
|
12
12
|
"@dcl/hashing": "1.1.3",
|
|
13
|
-
"@dcl/inspector": "7.5.8-
|
|
14
|
-
"@dcl/linker-dapp": "^0.
|
|
13
|
+
"@dcl/inspector": "7.5.8-10819179502.commit-e2e6cc5",
|
|
14
|
+
"@dcl/linker-dapp": "^0.14.1",
|
|
15
15
|
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
|
|
16
16
|
"@dcl/protocol": "1.0.0-10704143848.commit-a0c6d86",
|
|
17
17
|
"@dcl/quests-client": "^1.0.3",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"displayName": "SDK",
|
|
74
74
|
"tsconfig": "./tsconfig.json"
|
|
75
75
|
},
|
|
76
|
-
"commit": "
|
|
76
|
+
"commit": "e2e6cc53e45e1ca16dce348ce87785e921d3ae3a"
|
|
77
77
|
}
|