shopify-cli 2.2.1 → 2.5.0

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

@@ -9,7 +9,7 @@ module Script
         UUID_ENV_KEY = "UUID"
 
         property! :id, accepts: String
-        property :env, accepts: ShopifyCli::Resources::EnvFile
+        property :env, accepts: ShopifyCLI::Resources::EnvFile
 
         property! :extension_point_type, accepts: String
         property! :script_name, accepts: String
@@ -20,7 +20,7 @@ module Script
         def initialize(*)
           super
 
-          ShopifyCli::Core::Monorail.metadata = {
+          ShopifyCLI::Core::Monorail.metadata = {
             "script_name" => script_name,
             "extension_point_type" => extension_point_type,
             "language" => language,

data/lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb

@@ -0,0 +1,55 @@
+module Script
+  module Layers
+    module Infrastructure
+      module ApiClients
+        class PartnersProxyApiClient
+          def initialize(ctx, api_key)
+            @ctx = ctx
+            @api_key = api_key
+          end
+
+          def query(query_name, variables: {})
+            proxy_response = ShimAPI.query(@ctx, query_name, api_key: @api_key, variables: variables.to_json)
+            raise_if_graphql_failed(proxy_response)
+
+            response = proxy_response["data"]["scriptServiceProxy"]
+            JSON.parse(response) if response
+          end
+
+          private
+
+          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
+
+          class ShimAPI < ShopifyCLI::PartnersAPI
+            def query(query_name, variables: {})
+              variables[:query] = load_query(query_name)
+              super("script_service_proxy", variables: variables)
+            end
+          end
+          private_constant(:ShimAPI)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/infrastructure/api_clients/script_service_api_client.rb

@@ -0,0 +1,35 @@
+module Script
+  module Layers
+    module Infrastructure
+      module ApiClients
+        class ScriptServiceApiClient
+          LOCAL_INSTANCE_URL = "https://script-service.myshopify.io"
+
+          def initialize(ctx, api_key)
+            instance_url = script_service_url
+            @api = ShopifyCLI::API.new(
+              ctx: ctx,
+              url: "#{instance_url}/graphql",
+              token: { "APP_KEY" => api_key }.compact.to_json,
+              auth_header: "X-Shopify-Authenticated-Tokens"
+            )
+          end
+
+          def query(query_name, variables: {})
+            @api.query(query_name, variables: variables)
+          end
+
+          private
+
+          def script_service_url
+            if ::ShopifyCLI::Environment.use_spin_partners_instance?
+              "https://script-service.#{::ShopifyCLI::Environment.spin_url}"
+            else
+              LOCAL_INSTANCE_URL
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Script
       class CommandRunner
         include SmartProperties
 
-        property! :ctx, accepts: ShopifyCli::Context
+        property! :ctx, accepts: ShopifyCLI::Context
 
         def call(cmd)
           out, status = ctx.capture2e(cmd)

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/languages/assemblyscript_project_creator.rb

@@ -6,7 +6,7 @@ module Script
       module Languages
         class AssemblyScriptProjectCreator
           include SmartProperties
-          property! :ctx, accepts: ShopifyCli::Context
+          property! :ctx, accepts: ShopifyCLI::Context
           property! :extension_point, accepts: Domain::ExtensionPoint
           property! :script_name, accepts: String
           property! :path_to_project, accepts: String
@@ -40,7 +40,7 @@ module Script
           def extension_point_version
             return extension_point.sdks.assemblyscript.version if extension_point.sdks.assemblyscript.versioned?
 
-            out = command_runner.call("npm show #{extension_point.sdks.assemblyscript.package} version --json")
+            out = command_runner.call("npm -s show #{extension_point.sdks.assemblyscript.package} version --json")
             "^#{JSON.parse(out)}"
           end
 

data/lib/project_types/script/layers/infrastructure/languages/rust_project_creator.rb

@@ -6,7 +6,7 @@ module Script
       module Languages
         class RustProjectCreator
           include SmartProperties
-          property! :ctx, accepts: ShopifyCli::Context
+          property! :ctx, accepts: ShopifyCLI::Context
           property! :extension_point, accepts: Domain::ExtensionPoint
           property! :script_name, accepts: String
           property! :path_to_project, accepts: String

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

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       class PushPackageRepository
         include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
+        property! :ctx, accepts: ShopifyCLI::Context
 
         def create_push_package(script_project:, script_content:, compiled_type:, metadata:)
           build_file_path = file_path(script_project.id, compiled_type)
@@ -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_project_repository.rb

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       class ScriptProjectRepository
         include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
+        property! :ctx, accepts: ShopifyCLI::Context
 
         SCRIPT_JSON_FILENAME = "script.json"
         MUTABLE_ENV_VALUES = %i(uuid)
@@ -13,7 +13,7 @@ module Script
         def create(script_name:, extension_point_type:, language:)
           validate_metadata!(extension_point_type, language)
 
-          ShopifyCli::Project.write(
+          ShopifyCLI::Project.write(
             ctx,
             project_type: :script,
             organization_id: nil,
@@ -63,7 +63,7 @@ module Script
         end
 
         def create_env(api_key:, secret:, uuid:)
-          ShopifyCli::Resources::EnvFile.new(
+          ShopifyCLI::Resources::EnvFile.new(
             api_key: api_key,
             secret: secret,
             extra: {
@@ -125,7 +125,7 @@ module Script
         end
 
         def project
-          @project ||= ShopifyCli::Project.current(force_reload: true)
+          @project ||= ShopifyCLI::Project.current(force_reload: true)
         end
 
         def default_language
@@ -142,7 +142,7 @@ module Script
 
         class ScriptJsonRepository
           include SmartProperties
-          property! :ctx, accepts: ShopifyCli::Context
+          property! :ctx, accepts: ShopifyCLI::Context
 
           def get
             current_script_json || raise(Domain::Errors::NoScriptJsonFile)

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

@@ -7,39 +7,37 @@ module Script
   module Layers
     module Infrastructure
       class ScriptService
-        include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
+        def initialize(client:, api_key:)
+          @client = client
+          @api_key = api_key
+        end
 
-        def push(
+        def set_app_script(
           uuid:,
           extension_point_type:,
-          script_content:,
-          compiled_type:,
-          api_key: nil,
           force: false,
           metadata:,
-          script_json:
+          script_json:,
+          module_upload_url:
         )
-          query_name = "app_script_update_or_create"
+          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: module_upload_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 = make_request(query_name: query_name, 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
@@ -64,98 +62,31 @@ module Script
           end
         end
 
-        def get_app_scripts(api_key:, extension_point_type:)
+        def get_app_scripts(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"]
-        end
-
-        private
-
-        class ScriptServiceAPI < ShopifyCli::API
-          property(:api_key, accepts: String)
-
-          LOCAL_INSTANCE_URL = "https://script-service.myshopify.io"
-
-          def self.query(ctx, query_name, api_key: nil, variables: {})
-            api_client(ctx, api_key).query(query_name, variables: variables)
-          end
-
-          def self.api_client(ctx, api_key)
-            instance_url = spin_instance_url || LOCAL_INSTANCE_URL
-            new(
-              ctx: ctx,
-              url: "#{instance_url}/graphql",
-              token: "",
-              api_key: api_key
-            )
-          end
-
-          def self.spin_instance_url
-            workspace = ENV["SPIN_WORKSPACE"]
-            namespace = ENV["SPIN_NAMESPACE"]
-            return if workspace.nil? || namespace.nil?
-
-            "https://script-service.#{workspace}.#{namespace}.us.spin.dev"
-          end
-
-          def auth_headers(*)
-            tokens = { "APP_KEY" => api_key }.compact.to_json
-            { "X-Shopify-Authenticated-Tokens" => tokens }
-          end
-        end
-        private_constant(:ScriptServiceAPI)
-
-        class PartnersProxyAPI < ShopifyCli::PartnersAPI
-          def query(query_name, variables: {})
-            variables[:query] = load_query(query_name)
-            super("script_service_proxy", variables: variables)
-          end
+          variables = { appKey: @api_key, extensionPointName: extension_point_type.upcase }
+          response = make_request(query_name: query_name, variables: variables)
+          response["data"]["appScripts"]
         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)
-          end
-          raise_if_graphql_failed(resp)
-          resp
-        end
+        def generate_module_upload_url
+          query_name = "module_upload_url_generate"
+          variables = {}
+          response = make_request(query_name: query_name, variables: variables)
+          user_errors = response["data"]["moduleUploadUrlGenerate"]["userErrors"]
 
-        def bypass_partners_proxy
-          !ENV["BYPASS_PARTNERS_PROXY"].nil?
+          raise Errors::GraphqlError, user_errors if user_errors.any?
+          response["data"]["moduleUploadUrlGenerate"]["url"]
         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
+        private
 
-        def raise_if_graphql_failed(response)
+        def make_request(query_name:, variables: {})
+          response = @client.query(query_name, variables: variables)
           raise Errors::EmptyResponseError if response.nil?
+          raise Errors::GraphqlError, response["errors"] if response.key?("errors")
 
-          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
+          response
         end
       end
     end

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

@@ -0,0 +1,27 @@
+module Script
+  module Layers
+    module Infrastructure
+      class ScriptUploader
+        def initialize(script_service)
+          @script_service = script_service
+        end
+
+        def upload(script_content)
+          @script_service.generate_module_upload_url.tap do |url|
+            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
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Script
+  module Layers
+    module Infrastructure
+      class ServiceLocator
+        def self.api_client(ctx:, api_key:)
+          if ENV["BYPASS_PARTNERS_PROXY"]
+            ApiClients::ScriptServiceApiClient.new(ctx, api_key)
+          else
+            ApiClients::PartnersProxyApiClient.new(ctx, api_key)
+          end
+        end
+
+        def self.script_service(ctx:, api_key:)
+          client = api_client(ctx: ctx, api_key: api_key)
+          ScriptService.new(client: client, api_key: api_key)
+        end
+      end
+    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/tasks/ensure_env.rb

@@ -2,7 +2,7 @@ require "shopify_cli"
 
 module Script
   module Tasks
-    class EnsureEnv < ShopifyCli::Task
+    class EnsureEnv < ShopifyCLI::Task
       attr_accessor :ctx
 
       def call(ctx)
@@ -31,11 +31,11 @@ module Script
       def ask_org
         return stubbed_org if partner_proxy_bypass
 
-        if ShopifyCli::Shopifolk.check && wants_to_run_against_shopify_org?
-          ShopifyCli::Shopifolk.act_as_shopify_organization
+        if ShopifyCLI::Shopifolk.check && wants_to_run_against_shopify_org?
+          ShopifyCLI::Shopifolk.act_as_shopify_organization
         end
 
-        orgs = ShopifyCli::PartnersAPI::Organizations.fetch_with_app(ctx)
+        orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
         if orgs.count == 1
           default = orgs.first
           ctx.puts(ctx.message("script.application.ensure_env.organization", default["businessName"], default["id"]))
@@ -69,7 +69,7 @@ module Script
       end
 
       def ask_app(apps)
-        unless ShopifyCli::Shopifolk.acting_as_shopify_organization?
+        unless ShopifyCLI::Shopifolk.acting_as_shopify_organization?
           apps = apps.select { |app| app["appType"] == "custom" }
         end
 
@@ -89,8 +89,8 @@ module Script
       end
 
       def ask_script_uuid(app, extension_point_type)
-        script_service = Layers::Infrastructure::ScriptService.new(ctx: ctx)
-        scripts = script_service.get_app_scripts(api_key: app["apiKey"], extension_point_type: extension_point_type)
+        script_service = Layers::Infrastructure::ServiceLocator.script_service(ctx: ctx, api_key: app["apiKey"])
+        scripts = script_service.get_app_scripts(extension_point_type: extension_point_type)
 
         return nil unless scripts.count > 0 &&
           CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))