sora 24.02.25 → 24.02.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 595fdec94ad7aa62fa2490265ffd6633b039773570518115afd13446cf75f5aa
-  data.tar.gz: bab57e34ef9eb436ea590c8e5a3988cdd780e4ae657a254c5ecaadff82ef7239
+  metadata.gz: 488c9fe33a89000965087732638fafd292137467592fb99dc5341b45665a8b8a
+  data.tar.gz: 28c98019e9d9c51260264aec86c558fbc53538ae0aab46da688cd11a5623ee91
 SHA512:
-  metadata.gz: 221d63074168d433bbff41cb5507e381fa683b9e6ba8c5a46234b3c6e0764d38e0097582eda7981eb156098783058ef968a8612509813767bf8535d3fd2ff4af
-  data.tar.gz: 6c70324213cbf7a197939305b3c8892d3a4a7656ad6b689773fdc836354545f460ca06a257e899e034c374b22bf338c317426c0f2414e0115d2bb419df6c728c
+  metadata.gz: 022c2e1247b89595b5e0679739d4d99980d049a782b9ed1f4eaebedd89f92ea765cfc31afa5322dad4697ce45621502d376ed8d126d346f147257a935dd44b25
+  data.tar.gz: '0798d5c364a33d00dfd422badd7f544f1175ed09ce158294c11f5e881d1a3eae743e169301d2be4a7973da1920d8dab69a57018928f110184a80917d4e3edcfb'

data/.rubocop.yml

@@ -17,3 +17,6 @@ Layout/EndOfLine:
 
 Metrics/MethodLength:
   Enabled: False
+
+Metrics/AbcSize:
+  Enabled: False

data/README.md

@@ -2,3 +2,19 @@
 sora is an http server in Ruby that can send and receive strings and files.
 
 sora (Server Of Ruby for Access) can send and receive files, and transmit text strings to communicate information.
+
+- https://rubygems.org/gems/sora
+
+## Installation
+This gem is supported on Windows.
+
+### How to Install
+```ps1
+gem install sora
+```
+
+or
+
+```ps1
+rake install # Install from repository
+```

data/cgi-bin/get.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "cgi"
+require "json"
+require "securerandom"
+
+def get_content_type(filename)
+  content_types = {
+    ".txt" => "text/plain",
+    ".json" => "application/json",
+    ".js" => "text/javascript",
+    ".css" => "text/css",
+    ".csv" => "text/csv",
+    ".pdf" => "application/pdf",
+    ".xls" => "application/vnd.ms-excel",
+    ".xlsx" => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    ".doc" => "application/msword",
+    ".docx" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    ".ppt" => "application/vnd.ms-powerpoint",
+    ".pptx" => "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    ".gif" => "image/gif",
+    ".bmp" => "image/bmp",
+    ".svg" => "image/svg+xml",
+    ".zip" => "application/zip",
+    ".lzh" => "application/x-lzh",
+    ".tar" => "application/x-tar",
+    ".mp3" => "audio/mpeg",
+    ".mp4" => "video/mp4",
+    ".mpeg" => "video/mpeg",
+    ".jpg" => "image/jpeg",
+    ".jpeg" => "image/jpeg",
+    ".png" => "image/png",
+    ".html" => "text/html"
+  }
+
+  ext = File.extname(filename)
+  content_types[ext] || "text/html"
+end
+
+def file
+  cgi = CGI.new
+  params = cgi.params
+  unless params.key?("filename")
+    print cgi.header("text/plain")
+    return
+  end
+
+  file_path = File.join(File.expand_path("../data"), params["filename"][0])
+  File.open(file_path, "rb") do |f|
+    cgi.out(
+      {
+        "type" => get_content_type(file_path),
+        "content-disposition" => "inline; filename=#{File.basename(file_path)}"
+      }
+    ) do
+      f.read
+    end
+  end
+end
+
+file

data/cgi-bin/main.rb

@@ -7,8 +7,15 @@ require "securerandom"
 cgi = CGI.new
 print cgi.header("application/json")
 params = cgi.params
+
 @json_file_path = "../data/data.json"
 
+def log(text)
+  open("tmp", "a") do |f|
+    f.puts(text)
+  end
+end
+
 def read_json(filename)
   unless File.exist? filename
     File.open(filename, "w") do |f|
@@ -57,5 +64,54 @@ def delete(params)
   print JSON.pretty_generate(response)
 end
 
+def save_file(params)
+  return unless params.key?("file")
+
+  file = params["file"][0]
+  response = {
+    filename: file.original_filename
+  }
+
+  return if [".gitignore", "data.json"].include?(response[:filename])
+
+  file_path = File.join(File.expand_path("../data"), response[:filename])
+
+  File.open(file_path, "wb") do |f|
+    f.write file.read
+  end
+
+  print JSON.pretty_generate(response)
+end
+
+def remove_file(params)
+  return unless params.key?("removefile")
+
+  removefile = params["removefile"][0]
+  response = {
+    filename: removefile,
+    status: "NG"
+  }
+
+  return if [".gitignore", "data.json"].include?(response[:filename])
+
+  file_path = File.join(File.expand_path("../data"), response[:filename])
+
+  response[:status] = "OK" if File.exist?(file_path) && File.delete(file_path)
+
+  print JSON.pretty_generate(response)
+end
+
+def get_files(params)
+  return unless params.key?("files")
+
+  response = Dir.glob(File.join(File.expand_path("../data"), "*"))
+  response.map! { |e| File.basename(e) }
+  response.filter! { |e| !["data.json", ".gitignore"].include?(e) }
+  print JSON.pretty_generate(response)
+end
+
 get_json(params)
 delete(params)
+save_file(params)
+get_files(params)
+remove_file(params)

data/data/.gitignore

@@ -1 +1,2 @@
-data.json
+!.gitignore
+*

data/exe/sora

@@ -6,9 +6,9 @@ require "optparse"
 
 opt = OptionParser.new
 
-params = { port: 8080, document_root: File.expand_path("../../www", __FILE__) }
+params = { port: 8080, document_root: File.expand_path("../www", __dir__) }
 
-opt.on("-p [PORT]", "--port [PORT]") { |v| params[:port] = v.to_i }
+opt.on("-p [PORT]", "--port [PORT]", "Port number, default: 8080") { |v| params[:port] = v.to_i }
 
 opt.parse!(ARGV)
 

data/lib/sora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sora
-  VERSION = "24.02.25"
+  VERSION = "24.02.26"
 end

data/lib/sora.rb

@@ -19,6 +19,7 @@ module Sora
       }
     )
     srv.mount("/cgi-bin", WEBrick::HTTPServlet::CGIHandler, "#{document_root}/../cgi-bin/main.rb")
+    srv.mount("/get", WEBrick::HTTPServlet::CGIHandler, "#{document_root}/../cgi-bin/get.rb")
     srv.mount("/", WEBrick::HTTPServlet::FileHandler, "#{document_root}/index.html")
     srv.mount("/style", WEBrick::HTTPServlet::FileHandler, "#{document_root}/style.css")
     srv.mount("/js", WEBrick::HTTPServlet::FileHandler, "#{document_root}/main.js")

data/www/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="ja">
 
 <head>
     <meta charset="utf-8">
@@ -10,18 +10,43 @@
 
 <body>
     <main id="main">
-        <h1>sora</h1>
-        <div class="Grid Text-SendButton">
-            <input id="content" placeholder="Text..." class="TextBox" />
-            <input type="button" id="send-button" value="Send" class="Accent Button SendButton" />
+        <div id="wrap">
+            <h1 id="title-sora">sora</h1>
+            <div class="Grid Text-SendButton">
+                <input id="content" placeholder="Text..." class="TextBox">
+                <input type="button" id="send-button" value="Send" class="Accent Button SendButton">
+                <input value="Select a File" type="button" id="select-file-button" class="Button">
+                <form id="upload-form" class="Hidden">
+                    <input placeholder="none" type="file" name="file" id="select-file-button-pre">
+                </form>
+            </div>
+
+            <div id="file-list-wrap" class="Hidden">
+                <h2 id="file-list-title">Files</h2>
+                <div id="file-list">
+                    <ul id="file-list-ul"></ul>
+                </div>
+            </div>
+            
+            <div id="data-list-wrap" class="Hidden">
+                <h2 id="data-list-title">Texts</h2>
+                <div id="data-list">
+                </div>
+            </div>
         </div>
-        <div id="data-list"></div>
     </main>
-    <div id="contextmenu">
+    <div id="contextmenu" class="contextmenu">
         <ul>
+            <li id="right-click-copy" class="menu-top">Copy</li>
             <li id="right-click-delete">Delete</li>
         </ul>
     </div>
+    <div id="contextmenu-file" class="contextmenu">
+        <ul>
+            <li id="right-click-download-file" class="menu-top Hidden">Download</li>
+            <li id="right-click-delete-file">Delete</li>
+        </ul>
+    </div>
     <script src="/js"></script>
 </body>
 

data/www/main.js

@@ -11,14 +11,27 @@ function EncodeHTMLForm(data) {
 
 const content = document.getElementById("content");
 const sendButton = document.getElementById("send-button");
+const selectFileButton = document.getElementById("select-file-button");
+const selectFileButtonPre = document.getElementById("select-file-button-pre");
 const rightClickDelete = document.getElementById("right-click-delete");
+const rightClickDeleteFile = document.getElementById("right-click-delete-file");
+const rightClickCopy = document.getElementById("right-click-copy");
+const rightClickDownloadFile = document.getElementById("right-click-download-file");
+const contextmenuFile = document.getElementById('contextmenu-file');
+const fileListWrap = document.getElementById('file-list-wrap');
+const dataListWrap = document.getElementById('data-list-wrap');
+const fileListTitle = document.getElementById('file-list-title');
+const dataListTitle = document.getElementById('data-list-title');
+
 let rightClickTargetId = "";
+let fileTarget;
 let data = [];
 
 const refresh = () => {
     if(data == null) return;
     const dataList = document.getElementById("data-list");
     dataList.innerHTML = "";
+    dataListWrap.style.display = data.length == 0 ? "none" : "block";
     for(const text of data){
         const div = document.createElement("div");
         div.innerText = text['content'];
@@ -27,15 +40,14 @@ const refresh = () => {
         dataList.prepend(div);
 
         const contextmenu = document.getElementById('contextmenu');
-        const main = div;
-        main.addEventListener('contextmenu', (e) => {
+        div.addEventListener('contextmenu', (e) => {
             e.preventDefault();
             contextmenu.style.left = e.pageX + 'px';
             contextmenu.style.top = e.pageY + 'px';
             contextmenu.style.display = 'block';
             rightClickTargetId = e.target.id
         });
-        main.addEventListener('click', () => {
+        div.addEventListener('click', () => {
             contextmenu.style.display = 'none';
         });
     }
@@ -45,23 +57,44 @@ const send = (write) => {
     const xhr = new XMLHttpRequest();
     xhr.open("POST", "/cgi-bin");
     write ? xhr.send(EncodeHTMLForm({ "data": content.value })) : xhr.send(EncodeHTMLForm({ "data": "" }));
+    if(write && content.value != ""){
+        const dataList = document.getElementById("data-list");
+        const div = document.createElement("div");
+        div.innerText = content.value;
+        div.className = "message";
+        dataList.prepend(div);
+    }
     xhr.onreadystatechange = () => {
         let texts = JSON.parse(xhr.responseText || "null");
         if(texts == null) return;
         data = texts;
         refresh();
+        sendButton.disabled = false;
+        sendButton.classList.remove("disabled")
     }
 }
 
 const i18n = () => {
     const lang = window.navigator.language;
-    if(lang == 'ja'){
+    if(lang == 'ja' || lang == 'ja-JP'){
         content.placeholder = "テキストを入力...";
         sendButton.value = "送信";
-        rightClickDelete.innerText = "削除"
+        rightClickDelete.innerText = "削除";
+        rightClickDeleteFile.innerText = "削除";
+        rightClickDownloadFile.innerText = "ダウンロード";
+        rightClickCopy.innerText = "コピー";
+        selectFileButton.value = "ファイルを選択";
+        fileListTitle.innerText = "ファイル一覧";
+        dataListTitle.innerText = "テキスト一覧";
     }
 }
 
+rightClickCopy.addEventListener('click', () => {
+    const targetDOM = document.getElementById(rightClickTargetId);
+    navigator.clipboard.writeText(targetDOM.textContent);
+    contextmenu.style.display = 'none';
+});
+
 rightClickDelete.addEventListener('click', () => {
     const targetDOM = document.getElementById(rightClickTargetId);
     targetDOM.remove();
@@ -79,6 +112,90 @@ rightClickDelete.addEventListener('click', () => {
     contextmenu.style.display = 'none';
 });
 
+document.body.addEventListener('click', () => {
+    contextmenu.style.display = 'none';
+    contextmenuFile.style.display = 'none';
+});
+
+sendButton.addEventListener("click", () => {
+    if(content.value != ""){
+        sendButton.disabled = true;
+        sendButton.classList.add("disabled")
+        send(true)
+    }    
+});
+
+selectFileButton.addEventListener('click', () => {
+    selectFileButtonPre.click();
+});
+
+selectFileButtonPre.addEventListener('change', (e) => {
+    const form = document.getElementById("upload-form");
+    const formData = new FormData(form);
+    
+    const xhr = new XMLHttpRequest();
+    xhr.open("POST", "/cgi-bin");
+    xhr.upload.addEventListener('loadstart', () => {
+        console.log("Upload: start")
+    });
+
+    xhr.upload.addEventListener('load', () => {
+        // アップロード正常終了
+        console.log('Upload: done');
+        getFiles();
+    });
+
+    xhr.send(formData);
+});
+
+const getFiles = () => {
+    const xhr = new XMLHttpRequest();
+    xhr.open("POST", "/cgi-bin");
+    xhr.send(EncodeHTMLForm({ "files": "" }));
+    xhr.onreadystatechange = () => {
+        let texts = JSON.parse(xhr.responseText || "null");
+        if (texts == null)
+            return;
+
+        const fileListUl = document.getElementById('file-list-ul');
+        fileListUl.innerHTML = "";
+
+        const fileList = document.getElementById('file-list');
+        fileList.style.display = texts.length == 0 ? "none" : "block";
+        fileListWrap.style.display = texts.length == 0 ? "none" : "block";
+
+        for(const fileName of texts){
+            const div = document.createElement('li');
+            div.textContent = fileName;
+            
+            div.addEventListener('contextmenu', (e) => {
+                e.preventDefault();
+                contextmenuFile.style.left = e.pageX + 'px';
+                contextmenuFile.style.top = e.pageY + 'px';
+                contextmenuFile.style.display = 'block';
+                fileTarget = e.target;
+            });
+            div.addEventListener('click', () => {
+                contextmenuFile.style.display = 'none';
+                location.href = `/get?filename=${fileName}`
+            });
+
+            fileListUl.append(div);
+        }
+    };
+};
+
+rightClickDeleteFile.addEventListener("click", () => {
+    const fileName = fileTarget.textContent;
+    fileTarget.remove();
+    const xhr = new XMLHttpRequest();
+    xhr.open("POST", "/cgi-bin");
+    xhr.send(EncodeHTMLForm({ "removefile": fileName }));
+    xhr.onreadystatechange = () => {
+        getFiles();
+    };
+})
+
 i18n();
 send(false);
-sendButton.addEventListener("click", () => { send(true) });
+getFiles();

data/www/style.css

@@ -1,27 +1,42 @@
-body{
+html {
+    height: 100%;
+}
+
+body {
     background-color: #F3F3F3;
     font-family: Segoe UI, Meiryo UI;
+    min-height: 100%;
+    margin: 0;
 }
 
-main{
+main {
     max-width: 980px;
     margin: 0 auto;
 }
 
-.Grid{
+#wrap {
+    margin: 0 16px;
+    padding-top: 8px;
+}
+
+.Grid {
     display: grid;
 }
 
-.Text-SendButton{
-    grid-template-columns: 1fr auto;
+.Text-SendButton {
+    grid-template-columns: 1fr auto auto;
     margin-bottom: 8px;
 }
 
-.Text-SendButton .TextBox{
+.Text-SendButton .TextBox {
     margin-right: 8px;
 }
 
-.message{
+#send-button{
+    margin-right: 8px;
+}
+
+.message {
     margin-bottom: 8px;
     padding: 16px;
     border: solid 1px #E5E5E5;
@@ -30,8 +45,49 @@ main{
     font-size: 14px;
 }
 
+#contextmenu ul li {
+    margin-top: 4px;
+}
+
+#contextmenu ul li.menu-top {
+    margin-top: 0;
+}
+
+/* ファイルリスト */
+#file-list{
+    background-color: #F9F9F9;
+    padding: 8px;
+    margin-bottom: 8px;
+    border: solid 1px #E3E3E3;
+    border-radius: 8px;
+    display: none;
+}
+
+#file-list-ul{
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+    user-select: none;
+}
+
+#file-list-ul li{
+    border-radius: 4px;
+    padding: 4.75px 12px 4.75px 12px;
+    cursor: pointer;
+    margin-top: 4px;
+    font-size: 14px;
+}
+
+#file-list-ul li:nth-child(1){
+    margin-top: 0;
+}
+
+#file-list-ul li:hover{
+    background-color: #F0F0F0;
+}
+
 /* 右クリックメニュー */
-#contextmenu {
+.contextmenu {
     display: none;
     position: fixed;
     left: 0;
@@ -43,12 +99,12 @@ main{
     width: 192px;
 }
 
-#contextmenu ul{
+.contextmenu ul {
     padding-left: 0;
     margin: 0;
 }
 
-#contextmenu li {
+.contextmenu li {
     cursor: pointer;
     margin: 0;
     padding: 4.75px 0 4.75px 16px;
@@ -58,12 +114,16 @@ main{
     user-select: none;
 }
 
-#contextmenu li:hover {
+.contextmenu li:hover {
     background-color: #F0F0F0;
 }
 
 /* 共通コンポーネント */
-.TextBox{
+.Hidden {
+    display: none;
+}
+
+.TextBox {
     height: 27px;
     border: solid 1px #E5E5E5;
     border-bottom-color: #868686;
@@ -73,11 +133,11 @@ main{
     background-color: #FBFBFB;
 }
 
-.TextBox:hover{
+.TextBox:hover {
     background-color: #F6F6F6;
 }
 
-.TextBox:focus{
+.TextBox:focus {
     background-color: white;
     height: 27px;
     border-bottom-color: #0067C0;
@@ -86,7 +146,8 @@ main{
     padding-bottom: 1px;
 }
 
-.Button{
+.Button {
+    cursor: pointer;
     height: 32px;
     border: solid 1px #E5E5E5;
     border-bottom-color: #CCCCCC;
@@ -95,32 +156,40 @@ main{
     padding: 1px 12px;
 }
 
-.Button:hover{
+.Button:hover {
     background-color: #F6F6F6;
 }
 
-.Button:active{
+.Button:active {
     background-color: #F5F5F5;
     color: #5D5D5D;
     border-color: #E5E5E5;
 }
 
-.Button.Accent{
+.Button.Accent {
     background-color: #0067C0;
     border: solid 1px #1473C5;
     border-bottom-color: #003E73;
     color: white;
 }
 
-.Button.Accent:hover{
+.Button.Accent:hover {
     background-color: #1975C5;
     border: solid 1px #2B80CA;
     border-bottom-color: #0F4676;
 }
 
-.Button.Accent:active{
+.Button.Accent:active {
     background-color: #3183CA;
     border: solid 1px #3183CA;
     border-bottom-color: #3183CA;
     color: #C2DAEF;
 }
+
+.Button.disabled, .Button.disabled:hover {
+    cursor: not-allowed;
+    background-color: #F5F5F5 !important;
+    color: #9D9D9D;
+    border: solid 1px #E5E5E5 !important;
+    border-bottom-color: #E5E5E5 !important;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sora
 version: !ruby/object:Gem::Version
-  version: 24.02.25
+  version: 24.02.26
 platform: ruby
 authors:
 - MURATA Mitsuharu
@@ -9,7 +9,21 @@ autorequire:
 bindir: exe
 cert_chain: []
 date: 2024-02-25 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: sora (Server Of Ruby for Access) can send and receive files, and transmit
   text strings to communicate information.
 email:
@@ -25,6 +39,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- cgi-bin/get.rb
 - cgi-bin/main.rb
 - data/.gitignore
 - exe/sora