Update app.py

app.py

@@ -1,73 +1,167 @@
-from flask import Flask, request, jsonify, redirect, Response
 import os
+import time
+import threading
 import requests
+from datetime import datetime, timezone
+from flask import Flask, request, jsonify, redirect, Response
+
+# =========================
+# Channel.io 監視設定
+# =========================
+CHANNEL_ID = "200605"
+GROUP_ID = "519217"
+
+CHANNEL_MESSAGE_URL = (
+    f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/groups/{GROUP_ID}/messages"
+)
+
+PARAMS = {
+    "sortOrder": "desc",
+    "limit": 36,
+    "logFolded": "false",
+}
+
+X_ACCOUNT_BOT = os.getenv("channeliotokenbot2")
+if not X_ACCOUNT_BOT:
+    raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
+
+BOT_HEADERS = {
+    "accept": "application/json",
+    "accept-language": "ja",
+    "x-account": X_ACCOUNT_BOT,
+}
 
+# =========================
+# Flask 設定
+# =========================
 app = Flask(__name__)
 
+# =========================
+# 共通関数
+# =========================
+def parse_updated_at(value):
+    """updatedAt が int(ms) / ISO8601 の両対応"""
+    try:
+        if isinstance(value, (int, float)):
+            return datetime.fromtimestamp(value / 1000, tz=timezone.utc)
+        if isinstance(value, str):
+            return datetime.fromisoformat(value.replace("Z", "+00:00"))
+    except Exception:
+        pass
+    return None
+
+
+# =========================
+# Channel.io 監視スレッド
+# =========================
+def watch_channel_messages():
+    print("▶ Channel.io message watcher started")
+
+    while True:
+        try:
+            res = requests.get(
+                CHANNEL_MESSAGE_URL,
+                headers=BOT_HEADERS,
+                params=PARAMS,
+                timeout=30,
+            )
+            res.raise_for_status()
+
+            data = res.json()
+            messages = data.get("messages", [])
+
+            latest_msg = None
+            latest_time = None
+
+            for msg in messages:
+                plain_text = msg.get("plainText")
+                updated_at = msg.get("updatedAt")
+
+                if not plain_text or updated_at is None:
+                    continue
+
+                updated_time = parse_updated_at(updated_at)
+                if updated_time is None:
+                    continue
+
+                if latest_time is None or updated_time > latest_time:
+                    latest_time = updated_time
+                    latest_msg = msg
+
+            if latest_msg:
+                print(
+                    f"[{latest_time.isoformat()}] {latest_msg['plainText']}"
+                )
+            else:
+                print("条件に合う message が見つかりませんでした")
+
+        except Exception as e:
+            # スレッドが死なないように必ず catch
+            print("⚠ watcher error:", e)
+
+        time.sleep(60)
+
+
+# =========================
+# Flask ルーティング
+# =========================
 @app.route("/drive.com/files")
-def index():
-    ip = request.remote_addr  # クライアントIP取得
-    print(f"アクセスIP: {ip}")  # ログ表示
+def drive_redirect():
+    ip = request.remote_addr
+    print(f"アクセスIP: {ip}")
+    return redirect("https://drive.google.com/")
 
-    return redirect("https://drive.google.com/") 
 
 @app.route("/channel-io-managers")
 def get_managers():
-    # URLパラメータ取得
     limit = request.args.get("limit")
     since = request.args.get("since")
+    channel_id = request.args.get("channelid", CHANNEL_ID)
 
-    # パラメータがある場合だけ付ける
     params = {}
     if limit:
         params["limit"] = limit
     if since:
         params["since"] = since
-    
-    if request.args.get("channelid"):
-        CHANNEL_ID = request.args.get("channelid")
-    else:
-        CHANNEL_ID = "200605"
-        
-    BASE_URL = f"https://desk-api.channel.io/desk/channels/{CHANNEL_ID}/managers"
-    
+
+    url = f"https://desk-api.channel.io/desk/channels/{channel_id}/managers"
+
     headers = {
         "accept": "application/json",
-        "x-account": os.environ.get("channeliotokenmain")  # ←環境変数 token
+        "x-account": os.getenv("channeliotokenmain"),
     }
 
-    res = requests.get(BASE_URL, headers=headers, params=params)
-
-    # APIエラー処理
+    res = requests.get(url, headers=headers, params=params)
     if res.status_code != 200:
         return jsonify({"error": res.text}), res.status_code
 
-    json_data = res.json()
+    return jsonify(res.json().get("managers", []))
 
-    # managersの部分だけ返す
-    return jsonify(json_data.get("managers", []))
 
-@app.route("/cors-proxy")
-def corsproxy():
+@app.route("/cors-proxy", methods=["GET", "POST", "PATCH", "OPTIONS"])
+def cors_proxy():
     url = request.args.get("url")
     if not url:
         return "url パラメータが必要です", 400
 
-    if not url.startswith("http://") and not url.startswith("https://"):
-        return "http または https のURLのみ使用できます", 400
+    if not url.startswith(("http://", "https://")):
+        return "http / https のURLのみ使用できます", 400
 
     try:
-        resp = requests.get(url, headers=request.headers, timeout=60)
+        resp = requests.request(
+            method=request.method,
+            url=url,
+            headers={k: v for k, v in request.headers if k.lower() != "host"},
+            data=request.get_data(),
+            timeout=60,
+        )
 
-        # 元のレスポンスヘッダを継承
         response = Response(resp.content, resp.status_code)
 
-        # CORSヘッダを追記（上書きしない）
         response.headers["Access-Control-Allow-Origin"] = "*"
         response.headers["Access-Control-Allow-Headers"] = "*"
-        response.headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS"
+        response.headers["Access-Control-Allow-Methods"] = "GET, POST, PATCH, OPTIONS"
 
-        # ★ Content-Typeを元のままに設定 ★
         if "Content-Type" in resp.headers:
             response.headers["Content-Type"] = resp.headers["Content-Type"]
 
@@ -77,114 +171,18 @@ def corsproxy():
         return f"エラー: {str(e)}", 500
 
 
-
-@app.route("/cors-proxy", methods=["POST","PATCH"])
-def corsproxy_post():
-    url = request.args.get("url")
-    if not url:
-        return "url パラメータが必要です", 400
-
-    if not url.startswith("http://") and not url.startswith("https://"):
-        return "http または https のURLのみ使用できます", 400
-
-    try:
-        resp = requests.post(
-            url,
-            data=request.data,
-            headers=request.headers,
-            timeout=60
-        )
-
-        headers = {
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Headers": "*",
-            "Access-Control-Allow-Methods": "GET, POST, OPTIONS"
-        }
-
-        return Response(resp.content, resp.status_code, headers=headers)
-
-    except Exception as e:
-        return f"エラー: {str(e)}", 500
-
+# =========================
+# エントリーポイント
+# =========================
 if __name__ == "__main__":
-    app.run(debug=True, host="0.0.0.0", port=7860)
-
-
-
-import os
-import time
-import requests
-from datetime import datetime, timezone
-
-URL = "https://desk-api.channel.io/desk/channels/200605/groups/519217/messages"
-PARAMS = {
-    "sortOrder": "desc",
-    "limit": 36,
-    "logFolded": "false",
-}
-
-X_ACCOUNT = os.getenv("channeliotokenbot2")
-if not X_ACCOUNT:
-    raise RuntimeError("環境変数 channeliotokenbot2 が設定されていません")
-
-HEADERS = {
-    "accept": "application/json",
-    "accept-language": "ja",
-    "x-account": X_ACCOUNT,
-}
-
-def parse_updated_at(value):
-    """
-    updatedAt が
-    - int / float : UNIX time (ms)
-    - str         : ISO8601
-    のどちらでも処理できるようにする
-    """
-    if isinstance(value, (int, float)):
-        # ミリ秒 → 秒
-        return datetime.fromtimestamp(value / 1000, tz=timezone.utc)
-    elif isinstance(value, str):
-        return datetime.fromisoformat(value.replace("Z", "+00:00"))
-    else:
-        return None
-
-while True:
-    try:
-        response = requests.get(
-            URL,
-            headers=HEADERS,
-            params=PARAMS,
-            timeout=30,
+    # Flask debug の二重起動防止
+    if os.environ.get("WERKZEUG_RUN_MAIN") == "true" or not app.debug:
+        watcher = threading.Thread(
+            target=watch_channel_messages,
+            daemon=True,
+            name="ChannelWatcher",
         )
-        response.raise_for_status()
-
-        data = response.json()
-        messages = data.get("messages", [])
-
-        latest_msg = None
-        latest_time = None
+        watcher.start()
 
-        for msg in messages:
-            plain_text = msg.get("plainText")
-            updated_at = msg.get("updatedAt")
-
-            if not plain_text or updated_at is None:
-                continue
-
-            updated_time = parse_updated_at(updated_at)
-            if updated_time is None:
-                continue
-
-            if latest_time is None or updated_time > latest_time:
-                latest_time = updated_time
-                latest_msg = msg
-
-        if latest_msg:
-            print(latest_msg["plainText"])
-        else:
-            print("条件に合う message が見つかりませんでした")
-
-    except Exception as e:
-        print("エラー:", e)
-
-    time.sleep(60)
+    print("▶ Flask server starting")
+    app.run(debug=True, host="0.0.0.0", port=7860)