Новые изменения

backend/pb_migrations/1777232002_created_post_views.js

@@ -0,0 +1,112 @@
+/// <reference path="../pb_data/types.d.ts" />
+migrate((app) => {
+  const collection = new Collection({
+    "createRule": null,
+    "deleteRule": null,
+    "fields": [
+      {
+        "autogeneratePattern": "[a-z0-9]{15}",
+        "hidden": false,
+        "id": "text3208210256",
+        "max": 15,
+        "min": 15,
+        "name": "id",
+        "pattern": "^[a-z0-9]+$",
+        "presentable": false,
+        "primaryKey": true,
+        "required": true,
+        "system": true,
+        "type": "text"
+      },
+      {
+        "cascadeDelete": false,
+        "collectionId": "pbc_1125843985",
+        "hidden": false,
+        "id": "relation1519021197",
+        "maxSelect": 1,
+        "minSelect": 0,
+        "name": "post",
+        "presentable": false,
+        "required": false,
+        "system": false,
+        "type": "relation"
+      },
+      {
+        "autogeneratePattern": "",
+        "hidden": false,
+        "id": "text791980464",
+        "max": 0,
+        "min": 0,
+        "name": "visitor_hash",
+        "pattern": "",
+        "presentable": false,
+        "primaryKey": false,
+        "required": false,
+        "system": false,
+        "type": "text"
+      },
+      {
+        "autogeneratePattern": "",
+        "hidden": false,
+        "id": "text2783163181",
+        "max": 0,
+        "min": 0,
+        "name": "ip",
+        "pattern": "",
+        "presentable": false,
+        "primaryKey": false,
+        "required": false,
+        "system": false,
+        "type": "text"
+      },
+      {
+        "autogeneratePattern": "",
+        "hidden": false,
+        "id": "text3293145029",
+        "max": 0,
+        "min": 0,
+        "name": "user_agent",
+        "pattern": "",
+        "presentable": false,
+        "primaryKey": false,
+        "required": false,
+        "system": false,
+        "type": "text"
+      },
+      {
+        "hidden": false,
+        "id": "autodate2990389176",
+        "name": "created",
+        "onCreate": true,
+        "onUpdate": false,
+        "presentable": false,
+        "system": false,
+        "type": "autodate"
+      },
+      {
+        "hidden": false,
+        "id": "autodate3332085495",
+        "name": "updated",
+        "onCreate": true,
+        "onUpdate": true,
+        "presentable": false,
+        "system": false,
+        "type": "autodate"
+      }
+    ],
+    "id": "pbc_2019238136",
+    "indexes": [],
+    "listRule": null,
+    "name": "post_views",
+    "system": false,
+    "type": "base",
+    "updateRule": null,
+    "viewRule": null
+  });
+
+  return app.save(collection);
+}, (app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136");
+
+  return app.delete(collection);
+})

backend/pb_migrations/1777232058_updated_post_views.js

@@ -0,0 +1,22 @@
+/// <reference path="../pb_data/types.d.ts" />
+migrate((app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "deleteRule": "@request.auth.id != ''",
+    "updateRule": "@request.auth.id != ''"
+  }, collection)
+
+  return app.save(collection)
+}, (app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "deleteRule": null,
+    "updateRule": null
+  }, collection)
+
+  return app.save(collection)
+})

backend/pb_migrations/1777232226_updated_post_views.js

@@ -0,0 +1,20 @@
+/// <reference path="../pb_data/types.d.ts" />
+migrate((app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "updateRule": "@request.auth.id != \"\""
+  }, collection)
+
+  return app.save(collection)
+}, (app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "updateRule": "@request.auth.id != ''"
+  }, collection)
+
+  return app.save(collection)
+})

backend/pb_migrations/1777232798_updated_post_views.js

@@ -0,0 +1,24 @@
+/// <reference path="../pb_data/types.d.ts" />
+migrate((app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "createRule": "@request.method = \"POST\"",
+    "listRule": "@request.method = \"GET\"",
+    "viewRule": "@request.method = \"GET\""
+  }, collection)
+
+  return app.save(collection)
+}, (app) => {
+  const collection = app.findCollectionByNameOrId("pbc_2019238136")
+
+  // update collection data
+  unmarshal({
+    "createRule": null,
+    "listRule": null,
+    "viewRule": null
+  }, collection)
+
+  return app.save(collection)
+})

frontend/src/layouts/ArticleLayout.astro

@@ -314,20 +314,15 @@ const {
     const viewsEl = document.querySelector('.meta-views') as HTMLElement & { dataset: { postId: string } };
     if (viewsEl?.dataset?.postId) {
       const postId = viewsEl.dataset.postId;
-      const hasViewed = sessionStorage.getItem(`viewed_${postId}`);
       
-      if (!hasViewed) {
+      fetch(`/api/increment-views?postId=${postId}`, { method: 'POST' })
-        fetch(`/api/increment-views?postId=${postId}`, { method: 'POST' })
+        .then(res => res.json())
-          .then(res => res.json())
+        .then(data => {
-          .then(data => {
+          if (data.views !== undefined) {
-            if (data.views !== undefined) {
+            viewsEl.textContent = formatViews(data.views);
-              viewsEl.textContent = formatViews(data.views);
+          }
-            }
+        })
-          })
+        .catch(() => {});
-          .catch(() => {});
-        
-        sessionStorage.setItem(`viewed_${postId}`, 'true');
-      }
     }
 
     function formatViews(n: number): string {

frontend/src/lib/pbServer.ts

@@ -0,0 +1,16 @@
+import PocketBase from 'pocketbase';
+
+const PB_URL = import.meta.env.POCKETBASE_URL || 'http://127.0.0.1:8090';
+const PB_ADMIN_EMAIL = import.meta.env.PB_ADMIN_EMAIL || 'admin@example.com';
+const PB_ADMIN_PASSWORD = import.meta.env.PB_ADMIN_PASSWORD || 'admin_password';
+
+const pbServer = new PocketBase(PB_URL);
+
+export { pbServer };
+
+export async function initPbServer() {
+  if (!pbServer.authStore.isValid) {
+    await pbServer.collection('_superusers').authWithPassword(PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD);
+  }
+  return pbServer;
+}

frontend/src/pages/api/increment-views.ts

@@ -1,7 +1,6 @@
 import type { APIRoute } from 'astro';
 import crypto from 'crypto';
-
+import { initPbServer } from '@lib/pbServer';
-const POCKETBASE_URL = import.meta.env.POCKETBASE_URL || 'http://127.0.0.1:8090';
 
 const POCKETBASE_ID_REGEX = /^[a-z0-9]{15}$/;
 
@@ -19,6 +18,8 @@ function generateVisitorHash(ip: string, userAgent: string): string {
 
 export const POST: APIRoute = async ({ request, url }) => {
   try {
+    const pb = await initPbServer();
+    
     const postId = url.searchParams.get('postId');
 
     if (!postId || !POCKETBASE_ID_REGEX.test(postId)) {
@@ -28,19 +29,16 @@ export const POST: APIRoute = async ({ request, url }) => {
       );
     }
 
-    const postRes = await fetch(
+    let post;
-      `${POCKETBASE_URL}/api/collections/posts/records/${postId}`,
+    try {
-    );
+      post = await pb.collection('posts').getOne(postId);
-
+    } catch {
-    if (!postRes.ok) {
       return new Response(
         JSON.stringify({ error: 'Пост не найден' }),
         { status: 404, headers: { 'Content-Type': 'application/json' } }
       );
     }
 
-    const post = await postRes.json();
-
     const ip = getClientIp(request);
     const userAgent = request.headers.get('user-agent') || 'unknown';
     const visitorHash = generateVisitorHash(ip, userAgent);
@@ -49,33 +47,29 @@ export const POST: APIRoute = async ({ request, url }) => {
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
     const yesterdayStr = yesterday.toISOString();
 
-    const existingViewRes = await fetch(
+    let existingViews;
-      `${POCKETBASE_URL}/api/collections/post_views/records?` +
+    try {
-      new URLSearchParams({
+      existingViews = await pb.collection('post_views').getList(1, 1, {
         filter: `post="${postId}" && visitor_hash="${visitorHash}" && created >= "${yesterdayStr}"`,
-      })
+      });
-    );
+    } catch {
+      existingViews = { totalItems: 0 };
+    }
 
     let isNewView = false;
 
-    if (existingViewRes.ok) {
+    if (existingViews.totalItems === 0) {
-      const existingData = await existingViewRes.json();
+      isNewView = true;
-      if (existingData.items?.length === 0) {
-        isNewView = true;
 
-        await fetch(
+      try {
-          `${POCKETBASE_URL}/api/collections/post_views/records`,
+        await pb.collection('post_views').create({
-          {
+          post: postId,
-            method: 'POST',
+          visitor_hash: visitorHash,
-            headers: { 'Content-Type': 'application/json' },
+          ip: ip,
-            body: JSON.stringify({
+          user_agent: userAgent,
-              post: postId,
+        });
-              visitor_hash: visitorHash,
+      } catch {
-              ip: ip,
+        // ignore
-              user_agent: userAgent,
-            }),
-          }
-        );
       }
     }
 
@@ -84,14 +78,11 @@ export const POST: APIRoute = async ({ request, url }) => {
     if (isNewView) {
       totalViews += 1;
       
-      await fetch(
+      try {
-        `${POCKETBASE_URL}/api/collections/posts/records/${postId}`,
+        await pb.collection('posts').update(postId, { views: totalViews });
-        {
+      } catch {
-          method: 'PATCH',
+        // ignore
-          headers: { 'Content-Type': 'application/json' },
+      }
-          body: JSON.stringify({ views: totalViews }),
-        }
-      );
     }
 
     return new Response(
@@ -100,10 +91,10 @@ export const POST: APIRoute = async ({ request, url }) => {
     );
 
   } catch (error) {
-    console.error('[Increment Views API] Error:', error);
+    console.error('[Increment Views] Error:', error);
     return new Response(
       JSON.stringify({ error: 'Внутренняя ошибка сервера' }),
       { status: 500, headers: { 'Content-Type': 'application/json' } }
     );
   }
-};
+};