shopify-cli 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c4574b0b307dbe68a4cfe4d47e76a4825dbc2bb208b2fd891e0192e3158690
-  data.tar.gz: c365c04166d24b723c4b5d8e0612e722fec4e765f2efcc4a638d534ab60a645c
+  metadata.gz: c6192e829e79c4cfe8a1e6fe1214d17f57da63bcf3802de71a7171a0037a2c1a
+  data.tar.gz: 11f3a7167a24c5b011f930de1a9554176c6371c1a63350ea3a94d9965f521336
 SHA512:
-  metadata.gz: baecd34e68711439ab4986652a21d00dc7c8443ef92497cf516e535cb91b979280293a3d86936a5b4260984739b28adab3ece18fdedfa35087d8ed1ee7411f2c
-  data.tar.gz: c55111c54115aeb15b5c9cd29e48c1b42c2dbe89a79a509e74c3f2fdea0830ad693e9983ca00ad40468ed9c132c7202e0ca01681dc94866f191773c982811f14
+  metadata.gz: e35ac5b91dea19c5c443616063d1993eefe787b702a9813c4598361f264967baf09d6f4f34a54456b67c6c226cc96b032d3a2bb742ea5425c49fcd3ab843b1fe
+  data.tar.gz: c27174aeaf83c67b292a0374b591833f87be66df912e85389148d008e7df0d3c83252b81034d14e1388be2e9a34112f6e9bf925e26359fb11fbfe84cdd8bb875

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Unreleased
 ------
 
+Version 2.2.2
+------
+* [1382](https://github.com/Shopify/shopify-cli/pull/1382): Client side module upload for Scripts
+
 Version 2.2.1
 ------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.2.1)
+    shopify-cli (2.2.2)
       listen (~> 3.5)
       theme-check (~> 1.1)
 

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -0,0 +1,40 @@
+mutation AppScriptSet(
+  $uuid: String
+  $extensionPointName: ExtensionPointName!,
+  $title: String!,
+  $description: String,
+  $force: Boolean,
+  $schemaMajorVersion: String,
+  $schemaMinorVersion: String,
+  $scriptJsonVersion: String!,
+  $configurationUi: Boolean!,
+  $configurationDefinition: String!,
+  $moduleUploadUrl: String!,
+) {
+  appScriptSet(
+    uuid: $uuid
+    extensionPointName: $extensionPointName
+    title: $title
+    description: $description
+    force: $force
+    schemaMajorVersion: $schemaMajorVersion
+    schemaMinorVersion: $schemaMinorVersion,
+    scriptJsonVersion: $scriptJsonVersion,
+    configurationUi: $configurationUi,
+    configurationDefinition: $configurationDefinition,
+    moduleUploadUrl: $moduleUploadUrl,
+) {
+    userErrors {
+      field
+      message
+      tag
+    }
+    appScript {
+      uuid
+      appKey
+      configSchema
+      extensionPointName
+      title
+    }
+  }
+}

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -1,44 +0,0 @@
-mutation AppScriptUpdateOrCreate(
-  $extensionPointName: ExtensionPointName!,
-  $title: String,
-  $description: String,
-  $sourceCode: String,
-  $language: String,
-  $force: Boolean,
-  $schemaMajorVersion: String,
-  $schemaMinorVersion: String,
-  $useMsgpack: Boolean,
-  $uuid: String,
-  $configurationUi: Boolean!,
-  $scriptJsonVersion: String!,
-  $configurationDefinition: String!,
-) {
-  appScriptUpdateOrCreate(
-    extensionPointName: $extensionPointName
-    title: $title
-    description: $description
-    sourceCode: $sourceCode
-    language: $language
-    force: $force
-    schemaMajorVersion: $schemaMajorVersion
-    schemaMinorVersion: $schemaMinorVersion
-    useMsgpack: $useMsgpack,
-    uuid: $uuid
-    configurationUi: $configurationUi
-    scriptJsonVersion: $scriptJsonVersion
-    configurationDefinition: $configurationDefinition
-) {
-    userErrors {
-      field
-      message
-      tag
-    }
-    appScript {
-      uuid
-      appKey
-      configSchema
-      extensionPointName
-      title
-    }
-  }
-}

data/lib/project_types/script/graphql/module_upload_url_generate.graphql

@@ -0,0 +1,9 @@
+mutation moduleUploadUrlGenerate {
+  moduleUploadUrlGenerate {
+    url
+    userErrors {
+      field
+      message
+    }
+  }
+}

data/lib/project_types/script/layers/domain/push_package.rb

@@ -17,7 +17,7 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type:,
+          compiled_type: nil,
           metadata:,
           script_json:
         )
@@ -35,7 +35,6 @@ module Script
             uuid: @uuid,
             extension_point_type: @extension_point_type,
             script_content: @script_content,
-            compiled_type: @compiled_type,
             api_key: api_key,
             force: force,
             metadata: @metadata,

data/lib/project_types/script/layers/infrastructure/errors.rb

@@ -93,6 +93,8 @@ module Script
             super("WebAssembly binary not found")
           end
         end
+
+        class ScriptUploadError < ScriptProjectError; end
       end
     end
   end

data/lib/project_types/script/layers/infrastructure/push_package_repository.rb

@@ -32,7 +32,6 @@ module Script
             uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_content: script_content,
-            compiled_type: compiled_type,
             metadata: metadata,
             script_json: script_project.script_json,
           )

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -14,32 +14,31 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type:,
           api_key: nil,
           force: false,
           metadata:,
           script_json:
         )
-          query_name = "app_script_update_or_create"
+          url = UploadScript.new(ctx).call(api_key, script_content)
+
+          query_name = "app_script_set"
           variables = {
             uuid: uuid,
             extensionPointName: extension_point_type.upcase,
             title: script_json.title,
             description: script_json.description,
-            sourceCode: Base64.encode64(script_content),
-            language: compiled_type,
             force: force,
             schemaMajorVersion: metadata.schema_major_version.to_s, # API expects string value
             schemaMinorVersion: metadata.schema_minor_version.to_s, # API expects string value
-            useMsgpack: metadata.use_msgpack,
             scriptJsonVersion: script_json.version,
             configurationUi: script_json.configuration_ui,
             configurationDefinition: script_json.configuration&.to_json,
+            moduleUploadUrl: url,
           }
-          resp_hash = script_service_request(query_name: query_name, api_key: api_key, variables: variables)
-          user_errors = resp_hash["data"]["appScriptUpdateOrCreate"]["userErrors"]
+          resp_hash = MakeRequest.new(ctx).call(query_name: query_name, api_key: api_key, variables: variables)
+          user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]
 
-          return resp_hash["data"]["appScriptUpdateOrCreate"]["appScript"]["uuid"] if user_errors.empty?
+          return resp_hash["data"]["appScriptSet"]["appScript"]["uuid"] if user_errors.empty?
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
@@ -67,11 +66,14 @@ module Script
         def get_app_scripts(api_key:, extension_point_type:)
           query_name = "get_app_scripts"
           variables = { appKey: api_key, extensionPointName: extension_point_type.upcase }
-          script_service_request(query_name: query_name, api_key: api_key, variables: variables)["data"]["appScripts"]
+          response = MakeRequest.new(ctx).call(
+            query_name: query_name,
+            api_key: api_key,
+            variables: variables
+          )
+          response["data"]["appScripts"]
         end
 
-        private
-
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
 
@@ -114,47 +116,95 @@ module Script
         end
         private_constant(:PartnersProxyAPI)
 
-        def script_service_request(query_name:, variables: nil, **options)
-          resp = if bypass_partners_proxy
-            ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
-          else
-            proxy_through_partners(query_name: query_name, variables: variables, **options)
+        class MakeRequest
+          attr_reader :ctx
+
+          def initialize(ctx)
+            @ctx = ctx
           end
-          raise_if_graphql_failed(resp)
-          resp
-        end
 
-        def bypass_partners_proxy
-          !ENV["BYPASS_PARTNERS_PROXY"].nil?
-        end
+          def self.bypass_partners_proxy
+            !ENV["BYPASS_PARTNERS_PROXY"].nil?
+          end
 
-        def proxy_through_partners(query_name:, variables: nil, **options)
-          options[:variables] = variables.to_json if variables
-          resp = PartnersProxyAPI.query(ctx, query_name, **options)
-          raise_if_graphql_failed(resp)
-          JSON.parse(resp["data"]["scriptServiceProxy"])
-        end
+          def call(query_name:, variables: nil, **options)
+            resp = if MakeRequest.bypass_partners_proxy
+              ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
+            else
+              proxy_through_partners(query_name: query_name, variables: variables, **options)
+            end
+            raise_if_graphql_failed(resp)
+            resp
+          end
 
-        def raise_if_graphql_failed(response)
-          raise Errors::EmptyResponseError if response.nil?
-
-          return unless response.key?("errors")
-          case error_code(response["errors"])
-          when "forbidden"
-            raise Errors::ForbiddenError
-          when "forbidden_on_shop"
-            raise Errors::ShopAuthenticationError
-          when "app_not_installed_on_shop"
-            raise Errors::AppNotInstalledError
-          else
-            raise Errors::GraphqlError, response["errors"]
+          def proxy_through_partners(query_name:, variables: nil, **options)
+            options[:variables] = variables.to_json if variables
+            resp = PartnersProxyAPI.query(ctx, query_name, **options)
+            raise_if_graphql_failed(resp)
+            JSON.parse(resp["data"]["scriptServiceProxy"])
+          end
+
+          def raise_if_graphql_failed(response)
+            raise Errors::EmptyResponseError if response.nil?
+
+            return unless response.key?("errors")
+            case error_code(response["errors"])
+            when "forbidden"
+              raise Errors::ForbiddenError
+            when "forbidden_on_shop"
+              raise Errors::ShopAuthenticationError
+            when "app_not_installed_on_shop"
+              raise Errors::AppNotInstalledError
+            else
+              raise Errors::GraphqlError, response["errors"]
+            end
+          end
+
+          def error_code(errors)
+            errors.map do |e|
+              code = e.dig("extensions", "code")
+              return code if code
+            end
           end
         end
 
-        def error_code(errors)
-          errors.map do |e|
-            code = e.dig("extensions", "code")
-            return code if code
+        class UploadScript
+          attr_reader :ctx
+
+          def initialize(ctx)
+            @ctx = ctx
+          end
+
+          def call(api_key, script_content)
+            apply_module_upload_url(api_key).tap do |url|
+              upload(url, script_content)
+            end
+          end
+
+          private
+
+          def apply_module_upload_url(api_key)
+            query_name = "module_upload_url_generate"
+            variables = {}
+            resp_hash = MakeRequest.new(ctx).call(query_name: query_name, api_key: api_key, variables: variables)
+            user_errors = resp_hash["data"]["moduleUploadUrlGenerate"]["userErrors"]
+
+            raise Errors::GraphqlError, user_errors if user_errors.any?
+            resp_hash["data"]["moduleUploadUrlGenerate"]["url"]
+          end
+
+          def upload(url, script_content)
+            url = URI(url)
+
+            https = Net::HTTP.new(url.host, url.port)
+            https.use_ssl = true
+
+            request = Net::HTTP::Put.new(url)
+            request["Content-Type"] = "application/wasm"
+            request.body = script_content
+
+            response = https.request(request)
+            raise Errors::ScriptUploadError unless response.code == "200"
           end
         end
       end

data/lib/project_types/script/messages/messages.rb

@@ -141,6 +141,9 @@ module Script
           web_assembly_binary_not_found_suggestion: "No WebAssembly binary found." \
             "Check that your build npm script outputs the generated binary to the root of the directory." \
             "Generated binary should match the script name: <script_name>.wasm",
+
+          script_upload_cause: "Fail to upload script.",
+          script_upload_help: "Try again.",
         },
 
         create: {

data/lib/project_types/script/ui/error_handler.rb

@@ -237,6 +237,11 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found"),
             help_suggestion: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found_suggestion"),
           }
+        when Layers::Infrastructure::Errors::ScriptUploadError
+          {
+            cause_of_error: ShopifyCli::Context.message("script.error.script_upload_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.script_upload_help"),
+          }
         end
       end
     end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,8 +256,10 @@ files:
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
+- lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb