doraemon 1.0.14 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4bdf7f5bc56c25adb1740cd5895aed9e691f58c1d8d65b9ee927b54c980005
-  data.tar.gz: 20c6b6a1711262074b936762c0a9522dcf24706a2443d633dcbe96c73e5b9e7e
+  metadata.gz: cd9915b76a0811f54ca86b207607bf1fb203b0b03abe725e6eedda5387403f17
+  data.tar.gz: 01e2ac17bd28a96492657d994234f8fbfa6e0567f6c826a73bea5d1b9e6c095f
 SHA512:
-  metadata.gz: 141a231646384e2d35f85caafdcd3924c4f3fa9553704391ece07ed14fb225ef4f90a4c75422546b161163dbecd2a009ee6e7f06a42aed316d4fd4926143ffc9
-  data.tar.gz: a04210a4a7157f1f242e87746a62f90827b889e883cb527e5d8b94223f4622e481d4d31268dbff6d1ff49c5d16741aa8f5b8c6bfe1c63ff522520aad8bbf9ee1
+  metadata.gz: ab9f0aa9ebe998f00d1aa135a87b2efbdae4cd20d548a2fb152b06dbe20796aba57aa59c51db4095dc570d872f2c6911175692e833fdf96f5112642c9a76ef6f
+  data.tar.gz: 63a30862c9a0cd21b406902361df5d764ab82b6bfb55d36bfa309ce38ab8b40e1fb6808ec6c76b452510fe60c751c190ede214d0f2de266cb356e20fded7b551

data/exe/doraemon

@@ -25,11 +25,12 @@ Thread.new {
 
 sleep(0.5)
 
-ip = local_ip_address
+Doraemon::LOCAL_IP_ADDRESS = local_ip_address
+Doraemon::LOCAL_PORT = port
 
 puts "\n"
 puts '============================================='
-puts "Dashboard: http://#{ip}:#{port}/"
+puts "Dashboard: http://#{Doraemon::LOCAL_IP_ADDRESS}:#{port}/"
 puts '============================================='
 
 trap 'INT' do

data/lib/doraemon/api/apis.rb

@@ -3,13 +3,14 @@
 
 require 'sinatra'
 require_relative '../database'
+require_relative './base'
 
 module Doraemon
 
   class HTTPServer < Sinatra::Base
 
     post '/api/mocker/api/all' do
-      stream :keep_open do |out|
+      handle_api do |out|
         uid = request.uid_from_token
         scene_id = request.body_params['scene_id']
         DB.query_apis(scene_id) do |scene_name, is_actived, apis|
@@ -39,7 +40,7 @@ module Doraemon
     end
 
     post '/api/mocker/api/save' do
-      stream :keep_open do |out|
+      handle_api do |out|
         scene_id = request.body_params['scene_id']
         apis = request.body_params['apis']
         DB.save_apis(scene_id, apis) do |_|
@@ -50,7 +51,7 @@ module Doraemon
     end
 
     post '/api/mocker/api/create' do
-      stream :keep_open do |out|
+      handle_api do |out|
         scene_id = request.body_params['scene_id']
         path = request.body_params['path']
         DB.create_api(scene_id, path) do |api|
@@ -61,7 +62,7 @@ module Doraemon
     end
 
     post '/api/mocker/api/delete' do
-      stream :keep_open do |out|
+      handle_api do |out|
         id = request.body_params['id']
         DB.delete_api(id) do |_|
           out << {code: 0, msg: 'OK'}.to_json
@@ -71,7 +72,7 @@ module Doraemon
     end
 
     post '/api/mocker/api/modify' do 
-      stream :keep_open do |out|
+      handle_api do |out|
         id = request.body_params['id']
         enabled = request.body_params['enabled']
         path = request.body_params['path']

data/lib/doraemon/api/base.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'sinatra'
+
+module Doraemon
+  # 处理 API 请求，用于捕获异常并响应
+  def handle_api
+    stream :keep_open do |out|
+      begin
+        yield(out) if block_given?
+      rescue Exception => e
+        msg = e.full_message(order: :top)
+        puts "Catch exception: #{msg}"
+        out << {
+          code: -1, msg: msg
+        }
+        out.close
+      end
+    end
+  end
+end

data/lib/doraemon/api/login.rb

@@ -5,6 +5,7 @@ require 'sinatra'
 require_relative '../utils/aes'
 require_relative '../database'
 require_relative '../user'
+require_relative './base'
 
 module Doraemon
 
@@ -12,7 +13,7 @@ module Doraemon
 
     # 登录
     post '/api/mocker/user/login' do
-      stream :keep_open do |out|
+      handle_api do |out|
         username = request.body_params['username']
         DB.query_user(username) do |user|
           if user.nil?
@@ -30,15 +31,18 @@ module Doraemon
 
     # 用户注册
     post '/api/mocker/user/register' do
-      stream :keep_open do |out|
+      handle_api do |out|
         username = request.body_params['username']
-        DB.register_user(username) do |succ|
+        DB.register_user(username) do |succ, uid|
           if (succ)
-            out << {code: 0, msg: 'OK'}.to_json
+            DB.add_scene(uid, '默认场景') do |scene|
+              out << {code: 0, msg: 'OK'}.to_json
+              out.close
+            end
           else
             out << {code: -1, msg: '用户已注册'}.to_json
+            out.close
           end
-          out.close
         end
       end
     end

data/lib/doraemon/api/scenes.rb

@@ -5,6 +5,7 @@ require 'sinatra'
 require_relative '../database'
 require_relative '../utils/request'
 require_relative '../user'
+require_relative './base'
 
 module Doraemon
 
@@ -12,7 +13,7 @@ module Doraemon
 
     # 获取场景列表
     post '/api/mocker/scenes/all' do
-      stream :keep_open do |out|
+      handle_api do |out|
         uid = request.uid_from_token
         DB.query_scenes(uid) do |scenes|
           DB.query_user_with_uid(uid) do |user|
@@ -40,7 +41,7 @@ module Doraemon
 
     # 添加场景
     post '/api/mocker/scenes/add' do
-      stream :keep_open do |out|
+      handle_api do |out|
         uid = request.uid_from_token
         name = request.body_params['name']
         if name.nil? || name.length == 0
@@ -57,7 +58,7 @@ module Doraemon
 
     # 激活场景
     post '/api/mocker/scene/active' do 
-      stream :keep_open do |out|
+      handle_api do |out|
         uid = request.uid_from_token
         scene_id = request.body_params['scene_id']
         DB.active_scene(uid, scene_id) do |_|
@@ -69,7 +70,7 @@ module Doraemon
     end
 
     post '/api/mocker/scene/delete' do
-      stream :keep_open do |out|
+      handle_api do |out|
         uid = request.uid_from_token
         # TODO:
       end

data/lib/doraemon/context.rb

@@ -23,9 +23,9 @@ end
 
 def _web_echo(text = nil)
   if text.nil?
-    "http://192.168.2.81:4001/echo.html"
+    "http://#{Doraemon::LOCAL_IP_ADDRESS}:#{Doraemon::LOCAL_PORT}/echo.html"
   else
-    "http://192.168.2.81:4001/echo.html?text=#{text}"
+    "http://#{Doraemon::LOCAL_IP_ADDRESS}:#{Doraemon::LOCAL_PORT}/echo.html?text=#{text}"
   end
 end
 

data/lib/doraemon/dashboard/apis.html

@@ -15,11 +15,12 @@
 </head>
 
 <body>
-  <div class="container">
-    <div id="nav">
-      <div id="div_save_btn">
+  <div class="container-fluid">
+    <div class="nav">
+
+      <div class="nav-left-area">
         <button type="button" class="btn" id="back_btn" onclick="backBtnClicked()">
-          <span>
+          <span class="nav-text">
             <i class="fa fa-chevron-left" aria-hidden="true"></i>
             返回
           </span>
@@ -33,19 +34,22 @@
         <div class="scene_name">
           <p id="scene_name"></p>
         </div>
-        <div id="right-area">
-          <div id="user_info">
-            <div id="user_info_name"></div>
-            <div id="user_info_port"></div>
-          </div>
-          <div class="operation-button">
-            <a href="help.html" target="_blank">
-              <i class="fa fa-question-circle fa-lg" aria-hidden="true"></i>
-            </a>
-          </div>
+      </div>
+
+      <div class="nav-right-area">
+        <div id="user_info">
+          <div id="user_info_name"></div>
+          <div id="user_info_port"></div>
+        </div>
+        <div class="operation-button">
+          <a href="help.html" target="_blank">
+            <i class="fa fa-question-circle fa-lg" aria-hidden="true"></i>
+          </a>
         </div>
       </div>
+      
     </div>
+
     <div class="content">
       <div class="row">
         <div class="col-sm-3">

data/lib/doraemon/dashboard/css/apis.css

@@ -27,10 +27,6 @@
   margin-top: 5px;
 }
 
-#back_btn:hover {
-  background: #fff;
-}
-
 #save_btn {
   width: 100px;
   float: left;
@@ -65,6 +61,10 @@
   line-height: 50px;
 }
 
+.fa-question-circle {
+  color: #fff;
+}
+
 .left_panel {
   height: 50px;
   line-height: 50px;
@@ -104,23 +104,36 @@
   padding-left: 0px;
 }
 
-.api_path {
-  float: left;
-  font-family: monospace;
-  font-size: 12;
+.api_item_wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.api_path_wrap {
+  max-width: 85%;
+  word-wrap: break-word;
+  cursor: pointer;
 }
 
-.api_path_disabled {
+.api_path {
   float: left;
   font-family: monospace;
-  font-size: 12;
+  font-size: 12px;
+  font-weight: normal;
+  color: #0066CC;
 }
 
-.api_path_disabled a {
+.disabled {
   color: #aaa;
   font-style: italic;
 }
 
+.selected {
+  font-size: 13px;
+  font-weight: bold;
+}
+
 .api_delete {
   float: right;
 }

data/lib/doraemon/dashboard/css/global.css

@@ -1,25 +1,42 @@
 html, body {
   height: 100%;
-  margin: 0px auto;
+  margin: 0px;
   padding: 0px auto;
 }
 
-.container {
-  margin: 0 auto;
-  padding: 0 auto;
+.container-fluid {
+  padding: 0;
 }
 
-#nav {
-  background-color: #fff;
-  height: 50px;
+.nav {
+  background-color: #444;
+  height: 4rem;
+  display: block;
+  color: white;
+  font-weight: bold;
+}
+
+.nav-left-area {
+  position: absolute;
+  top: 0.5rem;
+  height: 3rem;
+  left: 2rem
+}
+
+.nav-right-area {
+  position: absolute;
+  top: 0.5rem;
+  height: 3rem;
+  right: 2rem
+}
+
+.nav-text {
+  color: white;
+  font-weight: bold;
 }
 
 .content {
-  width: 100%;
-  height: 100%;
-  top: 50px;
-  bottom: 0px;
-  left: 0px;
+  margin: 1rem 2rem 0 2rem;
 }
 
 #user_info {

data/lib/doraemon/dashboard/css/scenes.css

@@ -5,8 +5,8 @@
 #add_scene_btn {
   width: 100px;
   float: left;
-  margin-left: 10px;
-  margin-top:5px;
+  margin-top: 0.3rem;
+  height: 80%;
 }
 
 a.card-control {

data/lib/doraemon/dashboard/scenes.html

@@ -12,20 +12,24 @@
 </head>
 
 <body>
-  <div class="container-lg">
-    <div id="nav">
-      <div id="div_save_btn">
+  <div class="container-fluid">
+    <div class="nav">
+      <div class="nav-left-area">
         <button type="button" class="btn btn-primary" id="add_scene_btn" onclick="addSceneBtnClicked()">
           添加场景
         </button>
+      </div>
+      <div class="nav-right-area">
         <div id="user_info">
           <div id="user_info_name"></div>
           <div id="user_info_port"></div>
         </div>
       </div>
     </div>
-    <div class="row" id="scenes">
-      
+
+    <div class="content">
+      <div class="row" id="scenes">
+      </div>
     </div>
   </div>
 </body>

data/lib/doraemon/dashboard/script/apis.js

@@ -33,19 +33,26 @@ function reloadLeftSide() {
   $('tbody').empty();
   let rows = '';
   for (let i = 0; i < _apis.length; ++i) {
-    let api = _apis[i];
-    let className = "api_path";
-    if (!api.enabled) {
-      className += " api_path_disabled";
-    }
-    rows += '<tr>';
-    rows += '<td>';
-    rows += '<div>';
-    rows += '<div class="' + className + '" id=api_' + i + '><a href="javascript:void(0);" onclick="selectApi(' + i + ')"><div>' + api.path + '</div></a></div>';
-    rows += '<div class="api_delete" data-toggle="modal" data-target="#api_edit_modal" data-index=' + i + '><a href="javascript:void(0);"><i class="fa fa-edit fa-sm" aria-hidden="true"></i></a></div>';
-    rows += '</div>';
-    rows += '</td>';
-    rows += '</tr>';
+    const api = _apis[i];
+    const disabled = api.enabled ? '' : 'disabled';
+    rows += `
+    <tr>
+      <td>
+        <div class="api_item_wrap">
+          <div class="api_path_wrap" onclick="selectApi(${i})">
+            <div class="api_path ${disabled}" id="api_${i}">
+              ${api.path}
+            </div>
+          </div>
+          <div class="api_delete" data-toggle="modal" data-target="#api_edit_modal" data-index=${i}>
+            <a href="javascript:void(0);">
+              <i class="fa fa-edit fa-sm" aria-hidden="true"></i>
+            </a>
+          </div>
+        </div>
+      </td>
+    </tr>
+    `
   }
   if (rows.length) {
     $('tbody').append(rows);
@@ -54,12 +61,9 @@ function reloadLeftSide() {
 
 // 选中了一个 API
 function selectApi(index) {
-  $("#api_" + _selected_api_index).css('font-weight', 'normal');
-  $("#api_" + _selected_api_index).css('font-size', '12px');
-  let api = _apis[index];
-  $("#api_" + index).css('font-weight', 'bold');
-  $("#api_" + index).css('font-size', '13px');
-  monacoEditor.getModel().setValue(api.contents);
+  $("#api_" + _selected_api_index).removeClass('selected');
+  $("#api_" + index).addClass('selected');
+  monacoEditor.getModel().setValue(_apis[index].contents);
   _selected_api_index = index;
 }
 

data/lib/doraemon/dora_env.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+module Doraemon
+
+  LOCAL_IP_ADDRESS = nil
+
+  LOCAL_PORT = 4001
+
+end

data/lib/doraemon/gateway_server.rb

@@ -46,8 +46,10 @@ module Doraemon
 
       uri = URI.join(api_host, api_path)
 
+      uri.query = request.query_string
+
       h = request.extract_header(
-        'System-Version', 
+        'System-Version',
         'Authorization',
         'Accept',
         'Device-Id',
@@ -61,7 +63,8 @@ module Doraemon
         'User-Agent',
         'Connection',
         'Client',
-        'Sign'
+        'Sign',
+        'Cookie'
       )
       .merge \
         'Host': uri.host,
@@ -70,8 +73,12 @@ module Doraemon
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == 'https'
 
-      _req = Net::HTTP::Post.new(uri, h)
-      _req.body = request_body
+      is_get = request.request_method == 'GET'
+
+      _req = is_get ? Net::HTTP::Get.new(uri, h) : Net::HTTP::Post.new(uri, h)
+      if !is_get
+        _req.body = request_body
+      end
 
       _resp = http.request(_req)
 
@@ -150,6 +157,24 @@ module Doraemon
       end
     end
 
+    get '/mock/*' do
+      stream :keep_open do |out|
+        begin
+          handle_request(request) do |body|
+            out << body
+            out.close
+          end
+        rescue Exception => e
+          puts "Exception rescue: #{e.full_message(order: :top)}"
+          out << {
+            "code": -1,
+            "msg": "Doraemon: #{e.to_s}"
+          }.to_json
+          out.close
+        end
+      end
+    end
+
   end
-  
+
 end

data/lib/doraemon/sqlite_database.rb

@@ -49,12 +49,13 @@ module Doraemon
         port = next_port.first['next_port'].to_i
         reg_tm = (Time.now.to_f * 1000).to_i
         execute("INSERT INTO users (username, port, reg_tm) VALUES ('#{username}', #{port}, #{reg_tm})")
+        uid = @conn.last_insert_row_id
         execute("UPDATE configure SET next_port = #{port+1} WHERE id = 1")
         @mutex.unlock
-        yield(true) if block_given?
+        yield(true, uid) if block_given?
       else
         @mutex.unlock
-        yield(false) if block_given?
+        yield(false, -1) if block_given?
       end
     end
 
@@ -93,9 +94,9 @@ module Doraemon
       puts __method__.to_s
       @mutex.lock
       execute("INSERT INTO scenes (name, uid) VALUES ('#{name}', #{uid})")
-      result = execute("SELECT seq FROM sqlite_sequence WHERE name = 'users'")
+      result = execute("SELECT seq FROM sqlite_sequence WHERE name = 'scenes'")
       id = result.first['seq']
-      scene = {id: id, name: name, isActived: false}
+      scene = {id: id, name: name, isActived: false, apiCount: 0}
       @mutex.unlock
       yield(scene) if block_given?
     end
@@ -132,7 +133,7 @@ module Doraemon
       end
     end
 
-    # 获取所有 api
+    # 获取对应场景下的所有 api
     def query_apis(scene_id)
       puts __method__.to_s
       @mutex.lock

data/lib/doraemon/version.rb

@@ -1,3 +1,3 @@
 module Doraemon
-  VERSION = "1.0.14"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doraemon
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.17
 platform: ruby
 authors:
 - zhuoyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4
 description: a simple API mock server.
 email:
 - jiangzhuoyi@gmail.com
@@ -134,6 +148,7 @@ files:
 - exe/doraemon
 - lib/doraemon.rb
 - lib/doraemon/api/apis.rb
+- lib/doraemon/api/base.rb
 - lib/doraemon/api/login.rb
 - lib/doraemon/api/scenes.rb
 - lib/doraemon/context.rb
@@ -2939,6 +2954,7 @@ files:
 - lib/doraemon/dashboard/vendors/twitter-bootstrap/4.5.0/js/bootstrap.min.js
 - lib/doraemon/dashboard/vendors/twitter-bootstrap/4.5.0/js/bootstrap.min.js.map
 - lib/doraemon/database.rb
+- lib/doraemon/dora_env.rb
 - lib/doraemon/gateway_server.rb
 - lib/doraemon/http_server.rb
 - lib/doraemon/network.rb
@@ -2974,7 +2990,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: a simple API mock server