@dcl/sdk-commands 7.1.7-4743900895.commit-dea19db → 7.1.7-4745039397.commit-a6aff2b

package/dist/commands/deploy/index.js

@@ -3,18 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = exports.help = exports.args = void 0;
 const path_1 = require("path");
 const schemas_1 = require("@dcl/schemas");
-const dcl_catalyst_client_1 = require("dcl-catalyst-client");
 const crypto_1 = require("@dcl/crypto");
-const eth_connect_1 = require("eth-connect");
-const crypto_2 = require("@dcl/crypto/dist/crypto");
 const scene_validations_1 = require("../../logic/scene-validations");
 const args_1 = require("../../logic/args");
 const project_validations_1 = require("../../logic/project-validations");
-const api_1 = require("./linker-dapp/api");
 const error_1 = require("../../logic/error");
 const beautiful_logs_1 = require("../../logic/beautiful-logs");
-const account_1 = require("../../logic/account");
 const project_files_1 = require("../../logic/project-files");
+const utils_1 = require("./utils");
+const dcl_catalyst_client_1 = require("dcl-catalyst-client");
 exports.args = (0, args_1.declareArgs)({
     '--dir': String,
     '--help': Boolean,
@@ -89,15 +86,16 @@ async function main(options) {
     });
     // Signing message
     const messageToSign = entityId;
-    const { signature, address, chainId } = await getAddressAndSignature(options.components, messageToSign, sceneJson, files, {
+    const { linkerResponse, program } = await (0, utils_1.getAddressAndSignature)(options.components, messageToSign, sceneJson, files, {
         openBrowser,
         linkerPort,
         isHttps: !!options.args['--https'],
         skipValidations: !!options.args['--skip-validations'] || !!options.args['--target'] || !!options.args['--target-content']
     });
+    const { address, signature, chainId } = await linkerResponse;
     const authChain = crypto_1.Authenticator.createSimpleAuthChain(entityId, address, signature);
     // Uploading data
-    const catalyst = await getCatalyst(options.args['--target'], options.args['--target-content']);
+    const catalyst = await (0, utils_1.getCatalyst)(options.args['--target'], options.args['--target-content']);
     (0, beautiful_logs_1.printProgressInfo)(options.components.logger, `Uploading data to: ${catalyst.getContentUrl()}...`);
     const deployData = { entityId, files: entityFiles, authChain };
     const position = sceneJson.scene.base;
@@ -117,24 +115,9 @@ async function main(options) {
         options.components.logger.error(e);
         options.components.analytics.track('Scene deploy failure', { ...trackProps, error: e.message ?? '' });
     }
+    finally {
+        await program?.stop();
+    }
     options.components.analytics.track('Scene deploy success', { ...trackProps, dependencies });
 }
 exports.main = main;
-async function getCatalyst(target, targetContent) {
-    if (target) {
-        return new dcl_catalyst_client_1.CatalystClient({ catalystUrl: target.endsWith('/') ? target.slice(0, -1) : target });
-    }
-    if (targetContent) {
-        return new dcl_catalyst_client_1.ContentClient({ contentUrl: targetContent });
-    }
-    return dcl_catalyst_client_1.CatalystClient.connectedToCatalystIn({ network: 'mainnet' });
-}
-async function getAddressAndSignature(components, messageToSign, scene, files, linkOptions) {
-    if (process.env.DCL_PRIVATE_KEY) {
-        const wallet = (0, account_1.createWallet)(process.env.DCL_PRIVATE_KEY);
-        const signature = (0, crypto_2.ethSign)((0, eth_connect_1.hexToBytes)(wallet.privateKey), messageToSign);
-        return { signature, address: wallet.address };
-    }
-    const { linkerPort, ...opts } = linkOptions;
-    return (0, api_1.runLinkerApp)(components, scene, files, linkerPort, messageToSign, opts);
-}

package/dist/commands/deploy/linker-dapp/api.d.ts

@@ -1,3 +1,4 @@
+import { Lifecycle } from '@well-known-components/interfaces';
 import { ChainId, Scene } from '@dcl/schemas';
 import { IFile } from '../../../logic/scene-validations';
 import { CliComponents } from '../../../components';
@@ -21,4 +22,14 @@ export declare function runLinkerApp(cliComponents: Pick<CliComponents, 'fs' | '
     isHttps: boolean;
     skipValidations: boolean;
     openBrowser: boolean;
-}): Promise<LinkerResponse>;
+}): Promise<{
+    program: Lifecycle.ComponentBasedProgram<{
+        config: import("@well-known-components/interfaces").IConfigComponent;
+        logs: import("@well-known-components/interfaces").ILoggerComponent;
+        server: import("@well-known-components/http-server").FullHttpServerComponent<object>;
+        fs: import("../../../components/fs").IFileSystemComponent;
+        fetch: import("../../../components/fetch").IFetchComponent;
+        logger: import("@well-known-components/interfaces").ILoggerComponent.ILogger;
+    }>;
+    linkerResponse: import("fp-future").IFuture<LinkerResponse>;
+}>;

package/dist/commands/deploy/linker-dapp/api.js

@@ -16,43 +16,43 @@ const get_free_port_1 = require("../../../logic/get-free-port");
 const beautiful_logs_1 = require("../../../logic/beautiful-logs");
 const routes_1 = require("./routes");
 const config_1 = require("../../../logic/config");
-function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, skipValidations, openBrowser }) {
-    return new Promise(async (resolve) => {
-        const resolvedPort = await (0, get_free_port_1.getPort)(port);
-        const sceneInfo = await getSceneInfo(cliComponents, scene, rootCID, skipValidations);
-        const protocol = isHttps ? 'https' : 'http';
-        const queryParams = querystring_1.default.stringify(sceneInfo);
-        const url = `${protocol}://localhost:${resolvedPort}`;
-        const program = await interfaces_1.Lifecycle.run({
-            async initComponents() {
-                const config = (0, env_config_provider_1.createRecordConfigComponent)({
-                    HTTP_SERVER_PORT: resolvedPort.toString(),
-                    HTTP_SERVER_HOST: '0.0.0.0',
-                    ...process.env
-                });
-                const logs = await (0, logger_1.createConsoleLogComponent)({});
-                const https = isHttps ? await getCredentials(cliComponents) : undefined;
-                const server = await (0, http_server_1.createServerComponent)({ ...cliComponents, logs }, { https });
-                return { ...cliComponents, config, logs, server };
-            },
-            async main({ components, startComponents }) {
-                const { router, futureSignature } = (0, routes_1.setRoutes)(components, files, sceneInfo);
-                components.server.setContext(components);
-                components.server.use(router.allowedMethods());
-                components.server.use(router.middleware());
-                await startComponents();
-                if (openBrowser)
-                    await browse(components, url, queryParams);
-                const value = await futureSignature;
-                (0, beautiful_logs_1.printSuccess)(components.logger, `\nContent successfully signed.`, '');
-                components.logger.info(`Address: ${value.address}`);
-                components.logger.info(`Signature: ${value.signature}`);
-                components.logger.info(`Network: ${(0, schemas_1.getChainName)(value.chainId)}`);
-                resolve(value);
-            }
-        });
-        return program;
+const fp_future_1 = __importDefault(require("fp-future"));
+async function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, skipValidations, openBrowser }) {
+    const resolvedPort = await (0, get_free_port_1.getPort)(port);
+    const sceneInfo = await getSceneInfo(cliComponents, scene, rootCID, skipValidations);
+    const protocol = isHttps ? 'https' : 'http';
+    const queryParams = querystring_1.default.stringify(sceneInfo);
+    const url = `${protocol}://localhost:${resolvedPort}`;
+    const futureResponse = (0, fp_future_1.default)();
+    const program = await interfaces_1.Lifecycle.run({
+        async initComponents() {
+            const config = (0, env_config_provider_1.createRecordConfigComponent)({
+                HTTP_SERVER_PORT: resolvedPort.toString(),
+                HTTP_SERVER_HOST: '0.0.0.0',
+                ...process.env
+            });
+            const logs = await (0, logger_1.createConsoleLogComponent)({});
+            const https = isHttps ? await getCredentials(cliComponents) : undefined;
+            const server = await (0, http_server_1.createServerComponent)({ ...cliComponents, config, logs }, { https });
+            return { ...cliComponents, config, logs, server };
+        },
+        async main({ components, startComponents }) {
+            const { router, futureSignature } = (0, routes_1.setRoutes)(components, files, sceneInfo);
+            components.server.setContext(components);
+            components.server.use(router.allowedMethods());
+            components.server.use(router.middleware());
+            await startComponents();
+            if (openBrowser)
+                await browse(components, url, queryParams);
+            const value = await futureSignature;
+            (0, beautiful_logs_1.printSuccess)(components.logger, `\nContent successfully signed.`, '');
+            components.logger.info(`Address: ${value.address}`);
+            components.logger.info(`Signature: ${value.signature}`);
+            components.logger.info(`Network: ${(0, schemas_1.getChainName)(value.chainId)}`);
+            futureResponse.resolve(value);
+        }
     });
+    return { program, linkerResponse: futureResponse };
 }
 exports.runLinkerApp = runLinkerApp;
 async function browse({ logger }, url, params) {
@@ -65,7 +65,7 @@ async function browse({ logger }, url, params) {
             logger.error(`Unable to open browser automatically. Please manually navigate to:\n  ${url}?${params}`);
         }
     }, 5000);
-    logger.info(`Signing app ready at ${url}`);
+    logger.info(`Signing app ready at ${url}?${params}`);
 }
 async function getCredentials({ fs }) {
     const privateKey = await fs.readFile((0, path_1.resolve)(__dirname, '../../../certs/localhost.key'), 'utf-8');

package/dist/commands/deploy/utils.d.ts

@@ -0,0 +1,18 @@
+import { Scene } from '@dcl/schemas';
+import { Lifecycle } from '@well-known-components/interfaces';
+import { CatalystClient, ContentClient } from 'dcl-catalyst-client';
+import { CliComponents } from '../../components';
+import { IFile } from '../../logic/scene-validations';
+import { LinkerResponse } from './linker-dapp/api';
+export declare function getCatalyst(target?: string, targetContent?: string): Promise<CatalystClient | ContentClient>;
+interface LinkOptions {
+    openBrowser: boolean;
+    linkerPort?: number;
+    isHttps: boolean;
+    skipValidations: boolean;
+}
+export declare function getAddressAndSignature(components: CliComponents, messageToSign: string, scene: Scene, files: IFile[], linkOptions: LinkOptions): Promise<{
+    linkerResponse: Promise<LinkerResponse>;
+    program?: Lifecycle.ComponentBasedProgram<unknown>;
+}>;
+export {};

package/dist/commands/deploy/utils.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAddressAndSignature = exports.getCatalyst = void 0;
+const dcl_catalyst_client_1 = require("dcl-catalyst-client");
+const eth_connect_1 = require("eth-connect");
+const crypto_1 = require("@dcl/crypto/dist/crypto");
+const api_1 = require("./linker-dapp/api");
+const account_1 = require("../../logic/account");
+async function getCatalyst(target, targetContent) {
+    if (target) {
+        return new dcl_catalyst_client_1.CatalystClient({ catalystUrl: target.endsWith('/') ? target.slice(0, -1) : target });
+    }
+    if (targetContent) {
+        return new dcl_catalyst_client_1.ContentClient({ contentUrl: targetContent });
+    }
+    return dcl_catalyst_client_1.CatalystClient.connectedToCatalystIn({ network: 'mainnet' });
+}
+exports.getCatalyst = getCatalyst;
+async function getAddressAndSignature(components, messageToSign, scene, files, linkOptions) {
+    if (process.env.DCL_PRIVATE_KEY) {
+        const wallet = (0, account_1.createWallet)(process.env.DCL_PRIVATE_KEY);
+        const signature = (0, crypto_1.ethSign)((0, eth_connect_1.hexToBytes)(wallet.privateKey), messageToSign);
+        const linkerResponse = Promise.resolve({ signature, address: wallet.address });
+        return { linkerResponse };
+    }
+    const { linkerPort, ...opts } = linkOptions;
+    return (0, api_1.runLinkerApp)(components, scene, files, linkerPort, messageToSign, opts);
+}
+exports.getAddressAndSignature = getAddressAndSignature;

package/dist/logic/config.d.ts

@@ -15,5 +15,5 @@ export declare function isEditor(): boolean;
 export declare function isCI(): boolean;
 export declare function getCatalystBaseUrl(components: Pick<CliComponents, 'config'>): Promise<string>;
 export declare function getSegmentKey(): "sFdziRVDJo0taOnGzTZwafEL9nLIANZ3" | "mjCV5Dc4VAKXLJAH5g7LyHyW1jrIR3to";
-export declare function getLandRegistry(components: Pick<CliComponents, 'config'>): Promise<string>;
-export declare function getEstateRegistry(components: Pick<CliComponents, 'config'>): Promise<string>;
+export declare function getLandRegistry(components: Pick<CliComponents, 'config'>): Promise<string | undefined>;
+export declare function getEstateRegistry(components: Pick<CliComponents, 'config'>): Promise<string | undefined>;

package/dist/logic/config.js

@@ -58,11 +58,11 @@ function getSegmentKey() {
 exports.getSegmentKey = getSegmentKey;
 /* istanbul ignore next */
 async function getLandRegistry(components) {
-    return (0, config_1.requireStringConfig)(components, 'DCL_LAND_REGISTRY_ADDRESS');
+    return (0, config_1.readStringConfig)(components, 'DCL_LAND_REGISTRY_ADDRESS');
 }
 exports.getLandRegistry = getLandRegistry;
 /* istanbul ignore next */
 async function getEstateRegistry(components) {
-    return (0, config_1.requireStringConfig)(components, 'DCL_ESTATE_REGISTRY_ADDRESS');
+    return (0, config_1.readStringConfig)(components, 'DCL_ESTATE_REGISTRY_ADDRESS');
 }
 exports.getEstateRegistry = getEstateRegistry;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dcl/sdk-commands",
   "description": "",
-  "version": "7.1.7-4743900895.commit-dea19db",
+  "version": "7.1.7-4745039397.commit-a6aff2b",
   "author": "Decentraland",
   "bin": {
     "sdk-commands": "./dist/index.js"
   },
   "dependencies": {
     "@dcl/hashing": "1.1.3",
-    "@dcl/inspector": "7.1.7-4743900895.commit-dea19db",
+    "@dcl/inspector": "7.1.7-4745039397.commit-a6aff2b",
     "@dcl/linker-dapp": "0.7.0",
     "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
     "@dcl/protocol": "1.0.0-4671230683.commit-a8d74c3",
@@ -60,5 +60,5 @@
     "displayName": "SDK",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "dea19dbb7b318b555669d973af0a37bf3692f313"
+  "commit": "a6aff2b8a125015195c818a99a26c9ddea6ac692"
 }