jets 0.10.4 → 1.0.0

data/lib/jets/ruby_server.rb

@@ -2,11 +2,6 @@ require 'socket'
 require 'json'
 require 'stringio'
 
-# Save copy of old stdout, since Jets.boot messes with it.
-# So we can use $normal_stdout.puts for debugging.
-$normal_stdout ||= $stdout
-$normal_stderr ||= $stderr
-
 # https://ruby-doc.org/stdlib-2.3.0/libdoc/socket/rdoc/TCPServer.html
 # https://stackoverflow.com/questions/806267/how-to-fire-and-forget-a-subprocess
 #
@@ -27,27 +22,73 @@ module Jets
       # INT - ^C
       trap('INT') do
         puts "Shutting down ruby_server.rb..."
+        FileUtils.rm_f("/tmp/jets-rackup.pid") # remove the rack subprocess pid in case it exists
         sleep 0.1
         exit
       end
+
       if ENV['FOREGROUND'] # Usage above
-        serve
+        # start_rack_server # commented out because we expect user to start the rack server in the foreground
+        serve # ruby_server
         return
       end
 
-      # Reaching here means we'll run the server in the background
+      # Reaching here means we'll run the server in the "background"
       pid = Process.fork
-      if pid.nil?
-        serve
-      else
-        # parent process
-        Process.detach(pid)
+
+      if pid.nil? # we're in child process
+        start_rack_server
+        serve # ruby_server
+      else # we're in parent process
+        # Detach main jets ruby server
+        Process.detach(pid) # dettached but still in the "foreground" since server loop runs in the foreground
+      end
+    end
+
+    # Megamode support
+    def start_rack_server
+      return unless Jets.rack?
+
+      # Fire and forget for concurrent, will wait with wait_for_rack_socket
+      Thread.new do
+        Jets::Rack::Server.start
       end
+
+      wait_for_rack_socket # blocks until rack server is up
     end
 
+    # blocks until rack server is up
+    def wait_for_rack_socket
+      return unless Jets.rack?
+
+      retries = 0
+      max_retries = 30 # 15 seconds at a delay of 0.5s
+      delay = 0.5
+      if ENV['C9_USER'] # overrides for local testing
+        max_retries = 3
+        delay = 3
+      end
+      begin
+        server = TCPSocket.new('localhost', 9292)
+        server.close
+      rescue Errno::ECONNREFUSED
+        puts "Unable to connect to localhost:9292. Delay for #{delay} and will try to connect again."  if ENV['JETS_DEBUG']
+        sleep(delay)
+        retries += 1
+        if retries < max_retries
+          retry
+        else
+          puts "Giving up on trying to connect to localhost:9292"
+          return false
+        end
+      end
+      puts "Connected to localhost:9292 successfully"
+      true
+    end
+
+    # runs in the child process
     def serve
-      # child process
-      server = TCPServer.new(8080) # Server bind to port 8080
+      server = TCPServer.new(PORT) # Server bind to port 8080
       puts "Ruby server started on port #{PORT}" if ENV['FOREGROUND'] || ENV['JETS_DEBUG'] || ENV['C9_USER']
 
       loop do
@@ -55,10 +96,14 @@ module Jets
 
         input_completed, event, handler = nil, nil, nil
         unless input_completed
-          event = client.gets.strip # text
-          # puts event # uncomment for debugging, Jets has changed stdout to stderr
-          handler = client.gets.strip # text
-          # puts handler # uncomment for debugging, Jets has changed stdout to stderr
+          event = client.gets&.strip # text or nil
+          handler = client.gets&.strip # text or nil
+          # The event is nil when a client connects and immediately disconnects without sending data
+          if event.nil?
+            # puts "event was nil" # uncomment to debug
+            next
+          end
+
           input_completed = true
         end
 

data/lib/jets/server/api_gateway.rb

@@ -7,7 +7,7 @@ class Jets::Server
       route = RouteMatcher.new(env).find_route
       if route
         proxy = LambdaAwsProxy.new(route, env)
-        triplet = proxy.response
+        proxy.response # triplet
       else
         [404, {'Content-Type' => 'text/html'}, [routes_error_message(env)]]
       end

data/lib/jets/stack/resource.rb

@@ -22,7 +22,9 @@ class Jets::Stack
       attributes = template.values.first
       s3_key = attributes.dig('Properties','Code','S3Key')
       if s3_key == "code_s3_key_placeholder"
-        attributes['Properties']['Code']['S3Key'] = Jets::Naming.code_s3_key
+        checksum = Jets::Builders::Md5.checksums["stage/code"]
+        code_zip = "code-#{checksum}.zip"
+        attributes['Properties']['Code']['S3Key'] = "jets/code/#{code_zip}"
       end
       template
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.10.4"
+  VERSION = "1.0.0"
 end

data/lib/jets.rb

@@ -25,6 +25,7 @@ module Jets
   autoload :Dotenv, 'jets/dotenv'
   autoload :Erb, "jets/erb"
   autoload :Generator, "jets/generator"
+  autoload :Inflections, "jets/inflections"
   autoload :IO, "jets/io"
   autoload :Job, 'jets/job'
   autoload :Klass, 'jets/klass'
@@ -34,6 +35,7 @@ module Jets
   autoload :PolyFun, 'jets/poly_fun'
   autoload :Preheat, "jets/preheat"
   autoload :Processors, 'jets/processors'
+  autoload :Rack, "jets/rack"
   autoload :Rdoc, "jets/rdoc"
   autoload :Resource, "jets/resource"
   autoload :Route, "jets/route"
@@ -44,7 +46,6 @@ module Jets
   autoload :Stack, "jets/stack"
   autoload :Timing, "jets/timing"
   autoload :Util, "jets/util"
-  autoload :Inflections, "jets/inflections"
 
   extend Core # root, logger, etc
 end
@@ -66,9 +67,6 @@ end
 # TODO: move require "pg" into loader class and abstract to support more gems
 if File.exist?("#{Jets.root}config/database.yml")
   require "active_record"
-  # Note: think this is only needed for specs
-  # Apps require pg in their own Gemfile via bundler
-  exists = File.exist?("/var/task/bundled/gems/ruby/2.5.0/gems/pg-0.21.0/lib/pg_ext.so")
-  # Jets.logger.info("pg_ext.so exists #{exists.inspect}")
   require "pg" if Gem.loaded_specs.has_key?('pg')
+  require "mysql2" if Gem.loaded_specs.has_key?('mysql2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -439,12 +439,24 @@ files:
 - lib/jets/booter.rb
 - lib/jets/builders.rb
 - lib/jets/builders/code_builder.rb
-- lib/jets/builders/deducer.rb
 - lib/jets/builders/gem_replacer.rb
 - lib/jets/builders/handler_generator.rb
-- lib/jets/builders/node-hello.js
-- lib/jets/builders/node-shim.js
-- lib/jets/builders/shared_deducer.rb
+- lib/jets/builders/md5.rb
+- lib/jets/builders/md5_zip.rb
+- lib/jets/builders/rack_packager.rb
+- lib/jets/builders/rackup_wrappers/rackup
+- lib/jets/builders/rackup_wrappers/rackup.rb
+- lib/jets/builders/reconfigure_rails.rb
+- lib/jets/builders/reconfigure_rails/config/initializers/jets.rb
+- lib/jets/builders/ruby_packager.rb
+- lib/jets/builders/shim_vars.rb
+- lib/jets/builders/shim_vars/app.rb
+- lib/jets/builders/shim_vars/base.rb
+- lib/jets/builders/shim_vars/shared.rb
+- lib/jets/builders/templates/handler.js
+- lib/jets/builders/templates/shim.js
+- lib/jets/builders/tidy.rb
+- lib/jets/builders/util.rb
 - lib/jets/camelizer.rb
 - lib/jets/cfn.rb
 - lib/jets/cfn/builders.rb
@@ -460,6 +472,7 @@ files:
 - lib/jets/cfn/builders/shared_builder.rb
 - lib/jets/cfn/ship.rb
 - lib/jets/cfn/status.rb
+- lib/jets/cfn/upload.rb
 - lib/jets/cli.rb
 - lib/jets/commands.rb
 - lib/jets/commands/base.rb
@@ -496,12 +509,19 @@ files:
 - lib/jets/commands/help/dynamodb/generate.md
 - lib/jets/commands/help/dynamodb/migrate.md
 - lib/jets/commands/help/generate.md
+- lib/jets/commands/help/import/rack.md
+- lib/jets/commands/help/import/rails.md
 - lib/jets/commands/help/new.md
 - lib/jets/commands/help/routes.md
 - lib/jets/commands/help/runner.md
 - lib/jets/commands/help/server.md
 - lib/jets/commands/help/status.md
 - lib/jets/commands/help/url.md
+- lib/jets/commands/import.rb
+- lib/jets/commands/import/base.rb
+- lib/jets/commands/import/rack.rb
+- lib/jets/commands/import/rail.rb
+- lib/jets/commands/import/sequence.rb
 - lib/jets/commands/main.rb
 - lib/jets/commands/markdown.rb
 - lib/jets/commands/markdown/creator.rb
@@ -536,12 +556,14 @@ files:
 - lib/jets/commands/templates/skeleton/config/application.rb.tt
 - lib/jets/commands/templates/skeleton/config/database.yml.tt
 - lib/jets/commands/templates/skeleton/config/dynamodb.yml
+- lib/jets/commands/templates/skeleton/config/environments/development.rb
+- lib/jets/commands/templates/skeleton/config/environments/production.rb
 - lib/jets/commands/templates/skeleton/config/routes.rb
 - lib/jets/commands/templates/skeleton/db/.gitkeep
 - lib/jets/commands/templates/skeleton/public/404.html
 - lib/jets/commands/templates/skeleton/public/422.html
 - lib/jets/commands/templates/skeleton/public/500.html
-- lib/jets/commands/templates/skeleton/public/images/favicon.ico
+- lib/jets/commands/templates/skeleton/public/favicon.ico
 - lib/jets/commands/templates/skeleton/public/index.html.tt
 - lib/jets/commands/templates/skeleton/spec/controllers/posts_controller_spec.rb
 - lib/jets/commands/templates/skeleton/spec/fixtures/payloads/posts-index.json
@@ -586,8 +608,7 @@ files:
 - lib/jets/generator/templates/rails/scaffold_controller/controller.rb
 - lib/jets/inflections.rb
 - lib/jets/internal/app/controllers/jets/public_controller.rb
-- lib/jets/internal/app/controllers/jets/public_controller/python/show.py
-- lib/jets/internal/app/controllers/jets/public_controller/python/show.pyc
+- lib/jets/internal/app/controllers/jets/rack_controller.rb
 - lib/jets/internal/app/jobs/jets/preheat_job.rb
 - lib/jets/io.rb
 - lib/jets/job.rb
@@ -613,6 +634,10 @@ files:
 - lib/jets/processors.rb
 - lib/jets/processors/deducer.rb
 - lib/jets/processors/main_processor.rb
+- lib/jets/rack.rb
+- lib/jets/rack/hash_converter.rb
+- lib/jets/rack/request.rb
+- lib/jets/rack/server.rb
 - lib/jets/rails_overrides.rb
 - lib/jets/rails_overrides/asset_tag_helper.rb
 - lib/jets/rails_overrides/common_methods.rb

data/lib/jets/builders/node-hello.js

@@ -1,73 +0,0 @@
-'use strict';
-console.log('Loading hello world function');
-
-// https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html
-
-exports.handler = function(event, context, callback) {
-    let name = "you";
-    let city = 'World';
-    let time = 'day';
-    let day = '';
-    let responseCode = 200;
-    console.log("request: " + JSON.stringify(event));
-
-    // This is a simple illustration of app-specific logic to return the response.
-    // Although only 'event.queryStringParameters' are used here, other request data,
-    // such as 'event.headers', 'event.pathParameters', 'event.body', 'event.stageVariables',
-    // and 'event.requestContext' can be used to determine what response to return.
-    //
-    if (event.queryStringParameters !== null && event.queryStringParameters !== undefined) {
-        if (event.queryStringParameters.name !== undefined &&
-            event.queryStringParameters.name !== null &&
-            event.queryStringParameters.name !== "") {
-            console.log("Received name: " + event.queryStringParameters.name);
-            name = event.queryStringParameters.name;
-        }
-    }
-
-    if (event.pathParameters !== null && event.pathParameters !== undefined) {
-        if (event.pathParameters.proxy !== undefined &&
-            event.pathParameters.proxy !== null &&
-            event.pathParameters.proxy !== "") {
-            console.log("Received proxy: " + event.pathParameters.proxy);
-            city = event.pathParameters.proxy;
-        }
-    }
-
-    if (event.headers !== null && event.headers !== undefined) {
-        if (event.headers['day'] !== undefined && event.headers['day'] !== null && event.headers['day'] !== "") {
-            console.log("Received day: " + event.headers.day);
-            day = event.headers.day;
-        }
-    }
-
-    if (event.body !== null && event.body !== undefined) {
-        let body = JSON.parse(event.body)
-        if (body.time)
-            time = body.time;
-    }
-
-    let greeting = 'Good ' + time + ', ' + name + ' of ' + city + '. ';
-    if (day) greeting += 'Happy ' + day + '!';
-
-    var responseBody = {
-        message: greeting,
-        input: event
-    };
-
-    // The output from a Lambda proxy integration must be
-    // of the following JSON object. The 'headers' property
-    // is for custom response headers in addition to standard
-    // ones. The 'body' property  must be a JSON string. For
-    // base64-encoded payload, you must also set the 'isBase64Encoded'
-    // property to 'true'.
-    var response = {
-        statusCode: responseCode,
-        headers: {
-            "x-custom-header" : "my custom header value"
-        },
-        body: JSON.stringify(responseBody)
-    };
-    console.log("response: " + JSON.stringify(response))
-    callback(null, response);
-};

data/lib/jets/builders/node-shim.js

@@ -1,182 +0,0 @@
-'use strict';
-
-const spawn = require('child_process').spawn;
-const fs = require('fs');
-const readline = require('readline');
-const TMP_LOG_PATH = '/tmp/shim-subprocess.log';
-const subprocess_out = fs.openSync(TMP_LOG_PATH, 'a');
-const subprocess_err = fs.openSync(TMP_LOG_PATH, 'a');
-const JETS_DEBUG = process.env.JETS_DEBUG // set JETS_DEBUG=1 to see more debugging info
-const JETS_OUTPUT = '/tmp/jets-output.log';
-
-function once() {
-  // Uncomment fake run once locally. No need to do this on real lambda environment.
-  // var filename = '/tmp/once.txt';
-  // if (fs.existsSync(filename)) {
-  //   return;
-  // }
-  // fs.closeSync(fs.openSync(filename, 'w'));
-
-  // start tcp server and detach
-  const subprocess = spawn('bin/ruby_server', {
-    detached: true,
-    stdio: [ 'ignore', subprocess_out, subprocess_err ]
-  });
-  subprocess.on('error', function(err) {
-    log('bin/ruby_server error', err);
-  });
-
-  subprocess.on('close', function(exit_code) {
-    log("Subprocess was shut down or deattached!");
-  });
-
-  // prevent the parent from waiting for a subprocess to exit
-  // https://nodejs.org/api/child_process.html
-  subprocess.unref();
-}
-
-once();
-
-// Produces an Error object that displays in the AWS Lambda test console nicely.
-// The backtrace are the ruby lines, not the nodejs shim error lines.
-// The json payload in the Lambda console looks something like this:
-//
-//   {
-//     "errorMessage": "RubyError: RuntimeError: error in submethod",
-//     "errorType": "RubyError",
-//     "stackTrace": [
-//       [
-//         "line1",
-//         "line2",
-//         "line3"
-//       ]
-//     ]
-//   }
-//
-function rubyError(resp) {
-  var name = resp["errorType"]
-  var message = resp["errorMessage"]
-  var stack = resp["stackTrace"]
-  stack.unshift(message); // JS error includes the error message at the top of the stacktrac also
-  stack = stack.join("\n")
-
-  var error = new Error(message)
-  error.name = name
-  error.stack = stack
-  return error
-}
-
-// On AWS Lambda, we can log to either stdout or stderr and we're okay.
-// But locally when we're testing the shim, the log output can mess up piping
-// to jq. So not logging to stdout because when testing this shim locally the
-// stdout output messes up a pipe to jq.
-function log(text, level="info") {
-  if (level == "info" && JETS_DEBUG) {
-    // only log if JETS_DEBUG is set
-    console.error(text);
-  } else if (level == "debug") {
-    // always log if "debug" passed into method
-    console.error(text);
-  }
-}
-
-////////////////////////////
-// main logic for handler
-const net = require('net');
-const PORT = 8080;
-const HOST = '127.0.0.1';
-
-function request(event, handler, callback) {
-  log("event:");
-  log(event);
-  var client = new net.Socket();
-  client.connect(PORT, HOST, function() {
-    log('Connected to socket');
-    client.write(JSON.stringify(event));
-    client.write("\r\n") // important: \r\n is how server knows input is done
-    client.write(handler);
-    client.write("\r\n") // important: \r\n is how server knows input is done
-  });
-
-  // string concatation in javascript is faster than array concatation
-  // http://bit.ly/2gBMDs6
-  var stdout_buffer = ""; // stdout buffer
-  client.on('data', function(buffer) {
-  	log('Received data from socket: ' + buffer);
-    stdout_buffer += buffer;
-  });
-
-  client.on('close', function() {
-  	log('Socket connection closed');
-  	// If server is not yet running, socket immediately closes and stdout_buffer
-  	// is still empty. Return right away for this case, so request can retry.
-  	if (stdout_buffer == "") {
-  	  return;
-  	}
-
-    if (fs.existsSync(JETS_OUTPUT)) {
-      // Thanks: https://stackoverflow.com/questions/6156501/read-a-file-one-line-at-a-time-in-node-js
-      var rd = readline.createInterface({
-        input: fs.createReadStream(JETS_OUTPUT),
-        // output: process.stdout,
-        console: false
-      });
-
-      rd.on('line', function(line) {
-        // Important to use console.error in case locally testing shim or we see
-        // stdout "twice", once from here and once from ruby-land and it's confusing.
-        // AWS lambda will write console.error and console.log to CloudWatch.
-        console.error(line); // output to AWS Lambda Logs
-      });
-    }
-
-    var resp = JSON.parse(stdout_buffer);
-    if (resp["errorMessage"]) {
-      // Customize error object for lambda format
-      var error = rubyError(resp)
-      callback(error);
-    } else {
-      callback(null, resp);
-    }
-    client.destroy(); // kill client after server's response
-  });
-
-  client.on('error', function(error) {
-    log("Socket error:");
-    log(error);
-    log("Retrying request");
-    setTimeout(function() {
-      if (fs.existsSync(TMP_LOG_PATH)) {
-        var contents = fs.readFileSync(TMP_LOG_PATH, 'utf8');
-        if (contents != "") {
-          log("subprocess output:", "debug");
-          log(contents, "debug");
-        }
-      }
-      request(event, handler, callback);
-    }, 500);
-  });
-};
-
-<% @deducer.functions.each do |function_name| %>
-exports.<%= function_name %> = (event, context, callback) => {
-  request(event, "<%= @deducer.handler_for(function_name) %>", callback);
-}
-<% end %>
-
-// for local testing
-if (require.main === module) {
-  // fake event and context
-  var event = {"hello": "world"}
-  // var event = {"_prewarm": "1"} // prewarm special payload
-  // var event = {"body": {"hello": "world"}} // API Gateway wrapper structure
-  var context = {"fake": "context"}
-  exports.<%= @deducer.functions.first %>(event, context, (error, message) => {
-    log("\nLOCAL TESTING OUTPUT")
-    if (error) {
-      console.log("error message: %o", error)
-    } else {
-      console.log(JSON.stringify(message)) // stringify
-    }
-  })
-}

data/lib/jets/internal/app/controllers/jets/public_controller/python/show.py

@@ -1,47 +0,0 @@
-from pprint import pprint
-import json
-import os
-import os.path
-import mimetypes
-import sys
-
-def lambda_handler(event, context):
-    public_path = "public%s" % event["path"]
-
-    body = None
-    if os.path.exists(public_path):
-        body = render(public_path)
-
-    if body:
-        mimetype = mimetypes.guess_type(public_path)
-        headers = {"Content-Type": mimetype[0]}
-        return response(body, 200, headers)
-    else:
-        return response("404 Not Found: %s" % public_path, 404)
-
-def render(file=None):
-    with open(file,'r') as f:
-        return(f.read())
-
-def response(body, status_code=200, headers={}):
-    default_headers = {
-        'Content-Type': 'text/html',
-        'Access-Control-Allow-Origin': '*'
-    }
-    # http://treyhunner.com/2016/02/how-to-merge-dictionaries-in-python/
-    headers = {**default_headers, **headers}
-    return {
-        'statusCode': str(status_code),
-        'body': body,
-        'headers': headers,
-        }
-
-def log(message):
-    print(message, file=sys.stderr)
-
-if __name__ == '__main__':
-    with open('event.json') as f:
-        data = json.load(f)
-    # pprint(data)
-    # print(lambda_handler(data, {}))
-    print(json.dumps(lambda_handler(data, {}))) # if result is json