eitri-cli 1.15.0 → 1.16.0-beta.1

package/bitbucket-pipelines.yml

@@ -44,8 +44,10 @@ pipelines:
         caches:
           - node
         script:
+        - mkdir -p ~/.eitri/workspaces
+        - cp -r eitri-cli-v2/tests/fixtures/fake-workspace ~/.eitri/workspaces/workspace
         - cd eitri-cli-v2
-        - cargo test -- --test-threads=1
+        - cargo test -- --test-threads=1 --nocapture
     - step: &macOSCrossCompile
         image: 
           name: 343482176926.dkr.ecr.us-east-1.amazonaws.com/eitri-base-cli-pipeline:macos

package/eitri-cli-v2/Cargo.toml

@@ -35,6 +35,12 @@ log = "0.4.21"
 env_logger = "0.11.3"
 crossterm = "0.27.0"
 spinners = "4.1.1"
+regex = "1.10.4"
+walkdir = "2.5.0"
+zip = "2.1.0"
+sha1 = "0.10.6"
+file-hashing = "0.1.2"
+qr2term = "0.3.1"
 
 [dependencies.uuid]
 version = "1.8.0"

package/eitri-cli-v2/config/config.dev.toml

@@ -23,6 +23,10 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+setup = "/v2/workspace/setup"
+version = "/version"
+upload_all = "/uploadAll"
+file_upload = "/fileupload"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.loc.toml

@@ -23,6 +23,11 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+setup = "/v2/workspace/setup"
+version = "/version"
+upload_all = "/uploadAll"
+file_upload = "/fileupload"
+
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.prod.toml

@@ -23,6 +23,11 @@ run_test_path = "/foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+setup = "/v2/workspace/setup"
+version = "/version"
+upload_all = "/uploadAll"
+file_upload = "/fileupload"
+
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.runes-foundry.toml

@@ -7,3 +7,7 @@ run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+setup = "/v2/workspace/setup"
+version = "/version"
+upload_all = "/uploadAll"
+file_upload = "/fileupload"

package/eitri-cli-v2/config/config.test.toml

@@ -17,12 +17,17 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "/runes-foundry"
-target_path = "/runes-foundry/targets"
-run_test_path = "/runes-foundry/run-test"
+base_path = "/foundry"
+target_path = "/foundry/targets"
+run_test_path = "/foundry/run-test"
 share_path = "/foundry/share"
 clean_path = "/sources"
 shared_tags_json_path = "/user/:workspaceId/index.json"
+setup = "/v2/workspace/setup"
+version = "/version"
+upload_all = "/uploadAll"
+file_upload = "/fileupload"
+
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/index.d.ts

@@ -3,6 +3,10 @@
 
 /* auto-generated by NAPI-RS */
 
+export interface StartArguments {
+  shared?: boolean
+  verbose?: boolean
+}
 export interface EitriLibsArguments {
   bifrost?: boolean
   luminus?: boolean
@@ -11,6 +15,7 @@ export function publish(environment: string, message: string): Promise<void>
 export function runTest(userJwt: string, userWorkspaceId: string, testPath: string): Promise<void>
 export function eitriLibs(eitriLibsArgs: EitriLibsArguments): Promise<void>
 export function doctor(): Promise<void>
+export function start(args: StartArguments): Promise<void>
 export namespace app {
   export function start(): Promise<void>
   export function appLogs(): Promise<void>

package/eitri-cli-v2/index.js

@@ -295,11 +295,12 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { publish, runTest, eitriLibs, doctor, app, workspace } = nativeBinding
+const { publish, runTest, eitriLibs, doctor, start, app, workspace } = nativeBinding
 
 module.exports.publish = publish
 module.exports.runTest = runTest
 module.exports.eitriLibs = eitriLibs
 module.exports.doctor = doctor
+module.exports.start = start
 module.exports.app = app
 module.exports.workspace = workspace

package/index.js

@@ -80,12 +80,24 @@ const run = async () => {
       "-e, --emulator <platform>",
       "Abre o Eitri-App no emulador, desde que seja definido qual plataforma será aberto, android ou ios."
     )
-    .option("-sh, --shared", "Executa o Eitri-App no modo compartilhável.");
+    .option("-sh, --shared", "Executa o Eitri-App no modo compartilhável.")
 
   startProgram.action((cmdObj) => {
+    if (process.env.FT_START_V2 === "true") {
+      require('./eitri-cli-v2/eitri-cli-v2.linux-x64-gnu.node').start(cmdObj);
+      return;
+    }
     require("./src/cmd/start")(cmdObj);
   });
 
+  program
+    .command('test-initialization-params <initializationParams>')
+    .option("-v, --verbose", "Exibe mais logs")
+    .description('Define parâmetros na query string para inicializar o Eitri-App. Exemplo: stringChave1=stringValor1&stringChave2=stringValor2...')
+    .action((initializationParams, cmdObj) => {
+      require('./src/cmd/test-initialization-params')(initializationParams, cmdObj)
+    })
+
   program
     .command("push-version")
     .description(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.15.0",
+  "version": "1.16.0-beta.1",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/service/Workspace.js

@@ -377,9 +377,9 @@ class Workspace {
         return bootstrapBaseUrl;
     }
 
-    async getNewWorkspaceURL(args, setupConfig) {
+    async getNewWorkspaceURL(args, setupConfig, eitriAppConf) {
         const qrCodeConfig = await this.getQrCodeConfig(args, setupConfig);
-        const stateData = await this.saveShareState(qrCodeConfig);
+        const stateData = await this.saveShareState(qrCodeConfig, eitriAppConf);
         const stateId = stateData.id;
         const miniAppUrl = `${this.qrCodeUrl}/${stateId}`;
         return {
@@ -391,11 +391,16 @@ class Workspace {
         };
     }
 
-    async saveShareState(qrCodeConfig) {
+    async saveShareState(qrCodeConfig, eitriAppConf) {
         const createWorkspaceStateUrl = `${this.serverUrl}/${this.basePath}/share`;
         const requestBody = {
             id: uuidv4(),
-            state: qrCodeConfig,
+            state: {
+                ...qrCodeConfig,
+                eitriAppId: eitriAppConf?.id || "",
+                organizationId: eitriAppConf?.organizationId || "",
+                applicationId: eitriAppConf?.applicationId || "",
+            },
         };
         const response = await this.http.post(
             createWorkspaceStateUrl,

package/src/service/factories/QRCodeStarterFactory.js

@@ -19,9 +19,11 @@ function QRCodeStarter(
     this.setupConfig = setupConfig;
 
     this.startServer = async function () {
+        const eitriAppConf = this.workspace._miniConf;
         const workspaceURLConfig = await this.workspace.getNewWorkspaceURL(
                 this.args,
-                this.setupConfig
+                this.setupConfig,
+                eitriAppConf
             );
         const fullUrl = workspaceURLConfig.miniAppUrl
         if (this.args.verbose) {

package/src/service/factories/WebStarterFactory.js

@@ -46,7 +46,7 @@ function WebAppStarter(args, trackingService, watcher, workspace, targetConfig )
         const libsInfoForGA = this.args.libsInfoForGA
         TrackService.track(miniConf, this.trackingService, libsInfoForGA)
 
-        const {miniAppConf} = await this.workspace.getNewWorkspaceURL(this.args, this.targetConfig)
+        const {miniAppConf} = await this.workspace.getNewWorkspaceURL(this.args, this.targetConfig, miniConf)
         const { slug } = miniConf
 
         if(this.args.emulator){