@ozdao/martyrs 0.2.489 → 0.2.492

package/dist/wallet.server.cjs

@@ -331,7 +331,7 @@ const rewardsControllerFactory = (db, wdmClient, wss) => {
   const handleDepositUpdate = async (req, res) => {
     if (req.body.status === "TRANSFER_STATUS_COMPLETED") {
       const userWallet = await Wallet.findOne({ owner: new ObjectId(req.body.user) });
-      const amount = new bignumber_js.BigNumber(req.body.amount).shiftedBy(-8).dividedBy(process.env.TOKEN_EXCHANGE_RATE).toString();
+      const amount = new bignumber_js.BigNumber(req.body.amount).shiftedBy(-WDT_DECIMALS).dividedBy(process.env.TOKEN_EXCHANGE_RATE).toString();
       if (userWallet) {
         const topupIndex = userWallet.balances.findIndex((b) => b.name === "WDT");
         if (topupIndex < 0) {

package/dist/wallet.server.js

@@ -312,7 +312,7 @@ const rewardsControllerFactory = (db, wdmClient, wss) => {
   const handleDepositUpdate = async (req, res) => {
     if (req.body.status === "TRANSFER_STATUS_COMPLETED") {
       const userWallet = await Wallet.findOne({ owner: new ObjectId(req.body.user) });
-      const amount = new BigNumber(req.body.amount).shiftedBy(-8).dividedBy(process.env.TOKEN_EXCHANGE_RATE).toString();
+      const amount = new BigNumber(req.body.amount).shiftedBy(-WDT_DECIMALS).dividedBy(process.env.TOKEN_EXCHANGE_RATE).toString();
       if (userWallet) {
         const topupIndex = userWallet.balances.findIndex((b) => b.name === "WDT");
         if (topupIndex < 0) {

package/dist/{web-BXhlxo6M.cjs → web-D-YZ9KHz.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-CmuUC0tl.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-MzmGbSxs.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/dist/{web-Czi05iGG.js → web-D7lZjuC0.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-IVRL6IjM.js";
+import { W as p } from "./main-SZQ1QjeP.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.489",
+  "version": "0.2.492",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -95,7 +95,7 @@
     "@rsdoctor/rspack-plugin": "^0.4.13",
     "@rspack/cli": "^1.2.8",
     "@rspack/core": "^1.2.8",
-    "@vitejs/plugin-vue": "^5.2.3",
+    "@vitejs/plugin-vue": "^6.0.0",
     "connect-history-api-fallback": "^2.0.0",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "dotenv-webpack": "^8.1.0",
@@ -107,7 +107,7 @@
     "purgecss-webpack-plugin": "^7.0.2",
     "rimraf": "^6.0.1",
     "sass": "^1.85.1",
-    "vite": "^6.2.2",
+    "vite": "^7.0.3",
     "vitepress": "^1.6.3",
     "webpack": "^5.98.0",
     "webpack-dev-middleware": "^7.4.2",

package/src/builder/builder.js

@@ -3,14 +3,18 @@ import createSpaProdServer from './modes/spa.prod.js';
 import createSsrDevServer from './modes/ssr.dev.js';
 import createSsrProdServer from './modes/ssr.prod.js';
 import createSsrRspackDevServer from './modes/ssr.rspack.dev.js';
+import createSsrViteDevServer from './modes/ssr.vite.dev.js';
 import rspackConfigs from './rspack/index.js';
 import webpackConfigs from './webpack/index.js';
+import viteConfigs from './vite/index.js';
 
 export {
   rspackConfigs,
   createSsrRspackDevServer,
   webpackConfigs,
+  viteConfigs,
   createSsrDevServer,
+  createSsrViteDevServer,
   createSsrProdServer,
   createSpaDevServer,
   createSpaProdServer,
@@ -20,7 +24,9 @@ export default {
   rspackConfigs,
   createSsrRspackDevServer,
   webpackConfigs,
+  viteConfigs,
   createSsrDevServer,
+  createSsrViteDevServer,
   createSsrProdServer,
   createSpaDevServer,
   createSpaProdServer,

package/src/builder/modes/ssr.vite.dev.js

@@ -2,7 +2,7 @@ import compression from 'compression';
 import fs from 'fs';
 import path from 'path';
 import { createServer as createViteServer } from 'vite';
-import { createHtmlRenderer } from '../ssr/ssr-render-html.js';
+import { createHtmlRenderer } from '../ssr/ssr-render-html.vite.js';
 // Цвета для консоли
 const colors = {
   reset: '\x1b[0m',
@@ -13,7 +13,7 @@ const colors = {
   yellow: '\x1b[33m',
   red: '\x1b[31m',
 };
-export default (function createSsrDevServer(projectRoot, { clientConfig, apiConfig, ssrConfig, createServer }) {
+export default (function createSsrDevServer(projectRoot, { clientConfig, apiConfig, ssrConfig }) {
   let serverInstance;
   let viteDevServer;
   let rendererInstance;
@@ -26,7 +26,8 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
       let ssrEntry;
       try {
         // Используем Vite для трансформации и загрузки SSR-скрипта
-        ssrEntry = await vite.ssrLoadModule(ssrConfig.entry);
+        const ssrEntryPath = ssrConfig.build.rollupOptions.input;
+        ssrEntry = await vite.ssrLoadModule(ssrEntryPath);
       } catch (error) {
         console.error(colors.red + 'SSR compilation error' + colors.reset);
         console.error(error);
@@ -43,8 +44,10 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
         const bodyTags = [];
         // Добавляем основной скрипт клиентской части
         bodyTags.push(`<script type="module" src="/@vite/client"></script>`);
-        bodyTags.push(`<script type="module" src="${clientConfig.entry}"></script>`);
-        const initialState = JSON.stringify(state);
+        const clientEntryPath = clientConfig.build.rollupOptions.input.main;
+        const relativePath = path.relative(projectRoot, clientEntryPath);
+        bodyTags.push(`<script type="module" src="/${relativePath}"></script>`);
+        const initialState = JSON.stringify(state).replace(/</g, '\\u003c').replace(/>/g, '\\u003e');
         // Рендерим финальный HTML
         const completeHtml = await renderHtml({
           appHtml: html,
@@ -69,10 +72,12 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
     if (serverInstance) {
       serverInstance.close();
     }
-    // Очистка кэша модулей
-    Object.keys(require.cache).forEach(id => {
-      delete require.cache[id];
-    });
+    // Очистка кэша модулей (для CJS модулей)
+    if (typeof require !== 'undefined' && require.cache) {
+      Object.keys(require.cache).forEach(id => {
+        delete require.cache[id];
+      });
+    }
     try {
       // Создаем Vite Dev Server
       if (!viteDevServer) {
@@ -80,14 +85,27 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
           root: projectRoot,
           server: {
             middlewareMode: true,
-            hmr: true,
+            hmr: {
+              port: 24678, // Используем отдельный порт для HMR
+            },
             watch: {
-              usePolling: true,
-              interval: 100,
+              usePolling: false, // Отключаем polling
+              ignored: ['**/node_modules/**', '**/builds/**'], // Игнорируем ненужные директории
             },
           },
           appType: 'custom',
           logLevel: 'info',
+          // Настройки для SSR
+          ssr: {
+            noExternal: [
+              // Обрабатываем только клиентские зависимости через Vite
+              'vue', 'vue-router', 'vuex', 'vue-meta', '@vue/server-renderer'
+            ],
+            external: [
+              // Исключаем серверные Node.js модули
+              'jsonwebtoken', 'bcryptjs', 'nodemailer', 'crypto'
+            ]
+          },
           // Используем настройки из клиентского конфига
           ...clientConfig,
         });
@@ -95,10 +113,19 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
       // Создаем рендерер, если его ещё нет
       if (!rendererInstance) {
         rendererInstance = createDevRenderer(() => {
-          console.log(colors.green + 'Client updated, triggering reload...' + colors.reset);
+          // Теперь этот callback не должен вызываться постоянно
+          console.log(colors.green + 'Template updated' + colors.reset);
         });
       }
-      let { app, server, env } = await createServer();
+      // Динамически импортируем серверный модуль через Vite
+      const serverPath = apiConfig.build.rollupOptions.input;
+      const serverModule = await viteDevServer.ssrLoadModule(serverPath);
+      
+      if (typeof serverModule.createServer !== 'function') {
+        throw new Error("Экспорт createServer не найден");
+      }
+      
+      let { app, server, env } = await serverModule.createServer();
       // Применяем Vite middleware
       app.use(viteDevServer.middlewares);
       // Middleware для SSR
@@ -125,16 +152,22 @@ export default (function createSsrDevServer(projectRoot, { clientConfig, apiConf
       await server.listen(port);
       console.log(`${colors.greenBright}Server started at localhost:${port}${colors.reset}\n`);
       // Настройка наблюдения за изменениями серверных файлов
-      const watcher = fs.watch(path.dirname(createServer), { recursive: true });
+      const watcher = fs.watch(path.dirname(serverPath), { recursive: true });
+      let debounceTimer;
       watcher.on('change', async (eventType, filename) => {
         if (filename && filename.endsWith('.js')) {
           console.log(`${colors.blue}Server file changed: ${filename}, updating...${colors.reset}`);
-          try {
-            await startServer();
-          } catch (err) {
-            console.error(colors.red + 'Server restart failed' + colors.reset);
-            console.error(err);
-          }
+          
+          // Debounce для предотвращения множественных перезагрузок
+          clearTimeout(debounceTimer);
+          debounceTimer = setTimeout(async () => {
+            try {
+              await startServer();
+            } catch (err) {
+              console.error(colors.red + 'Server restart failed' + colors.reset);
+              console.error(err);
+            }
+          }, 500);
         }
       });
     } catch (err) {

package/src/builder/rspack/rspack.config.spa.client.js

@@ -4,6 +4,8 @@ import Mustache from 'mustache';
 import path from 'path';
 import { merge } from 'webpack-merge';
 import { StatsWriterPlugin } from 'webpack-stats-plugin';
+import { InjectManifest } from '@aaroon/workbox-rspack-plugin';
+import { RspackManifestPlugin } from 'rspack-manifest-plugin';
 import template from '../templates/page.js';
 import getClientConfig from './rspack.config.ssr.client.js';
 const { rspack } = core;
@@ -54,7 +56,50 @@ export default projectRoot => {
       //     { from: path.resolve(projectRoot, "../public/icons"), to: 'icons' }
       //   ]
       // })
-      // new ServiceWorkerPlugin()
+      // PWA: инжектим манифест в существующий sw.js (унифицированно с SSR)
+      new InjectManifest({
+        swSrc: path.resolve(projectRoot, '../public/sw.js'),
+        swDest: 'sw.js',
+        exclude: [/\.html$/, /\.map$/],
+        manifestTransforms: [
+          (manifestEntries) => {
+            const manifest = manifestEntries.filter(entry => {
+              return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+            });
+            return { manifest };
+          }
+        ]
+      }),
+      // PWA Manifest
+      new RspackManifestPlugin({
+        fileName: 'manifest.json',
+        seed: {
+          name: process.env.APP_NAME || 'OZDAO App',
+          short_name: process.env.APP_SHORT_NAME || 'OZDAO',
+          description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
+          theme_color: '#000000',
+          background_color: '#ffffff',
+          display: 'standalone',
+          orientation: 'portrait',
+          scope: '/',
+          start_url: '/',
+          icons: [
+            {
+              src: '/favicon/android-chrome-192x192.png',
+              sizes: '192x192',
+              type: 'image/png'
+            },
+            {
+              src: '/favicon/android-chrome-512x512.png', 
+              sizes: '512x512',
+              type: 'image/png'
+            }
+          ]
+        },
+        generate: (seed, files, entrypoints) => {
+          return seed;
+        }
+      }),
     ],
     optimization: {
       minimizer: [new rspack.SwcJsMinimizerRspackPlugin(), , new rspack.LightningCssMinimizerRspackPlugin()],

package/src/builder/rspack/rspack.config.ssr.client.js

@@ -5,6 +5,7 @@ import { merge } from "webpack-merge";
 import { StatsWriterPlugin } from "webpack-stats-plugin";
 import { GenerateSW, InjectManifest } from '@aaroon/workbox-rspack-plugin';
 import { PurgeCSSPlugin } from "purgecss-webpack-plugin";
+import { RspackManifestPlugin } from 'rspack-manifest-plugin';
 import baseConfig from './rspack.config.base.js';
 
 export default (projectRoot) => {
@@ -64,6 +65,49 @@ export default (projectRoot) => {
           },
         ],
       }),
+      // PWA PWA PWA PWA PWA
+      // PWA: инжектим манифест в существующий sw.js
+      // new InjectManifest({
+      //   swSrc: path.resolve(projectRoot, '../public/sw.js'),
+      //   swDest: 'sw.js',
+      //   exclude: [/\.html$/, /\.map$/],
+      //   manifestTransforms: [
+      //     (manifestEntries) => {
+      //       const manifest = manifestEntries.filter(entry => {
+      //         return !entry.url.match(/\.(html|map)$/) && entry.size < 5 * 1024 * 1024;
+      //       });
+      //       return { manifest };
+      //     }
+      //   ]
+      // }),
+      // // PWA Manifest
+      // new RspackManifestPlugin({
+      //   fileName: 'manifest.json',
+      //   seed: {
+      //     name: process.env.APP_NAME || 'OZDAO App',
+      //     short_name: process.env.APP_SHORT_NAME || 'OZDAO',
+      //     description: process.env.APP_DESCRIPTION || 'OZDAO Progressive Web App',
+      //     theme_color: '#000000',
+      //     background_color: '#ffffff',
+      //     display: 'standalone',
+      //     orientation: 'portrait',
+      //     scope: '/',
+      //     start_url: '/',
+      //     icons: [
+      //       {
+      //         src: '/favicon/android-chrome-192x192.png',
+      //         sizes: '192x192',
+      //         type: 'image/png'
+      //       },
+      //       {
+      //         src: '/favicon/android-chrome-512x512.png', 
+      //         sizes: '512x512',
+      //         type: 'image/png'
+      //       }
+      //     ]
+      //   },
+      //   generate: (seed) => seed
+      // }),
     ],
     optimization: {
       usedExports: true,  

package/src/builder/ssr/ssr-render-html.vite.js

@@ -0,0 +1,35 @@
+import Mustache from 'mustache';
+import template from '../templates/page.js';
+
+const renderHtml = async stuff => {
+  const data = {
+    ...stuff,
+    googleTagId: process.env.GOOGLE_TAG_ID,
+    facebookPixelId: process.env.FACEBOOK_PIXEL_ID,
+    facebookDomainVerification: process.env.FACEBOOK_DOMAIN_VERIFICATION,
+    googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY,
+  };
+  return Mustache.render(template, data);
+};
+
+const createHtmlRenderer = onTemplateUpdate => {
+  // Для Vite не нужен setInterval - HMR сам обновляет модули
+  // onTemplateUpdate используется только если нужно принудительно обновить
+  
+  return async stuff => {
+    const data = {
+      ...stuff,
+      googleTagId: process.env.GOOGLE_TAG_ID,
+      facebookPixelId: process.env.FACEBOOK_PIXEL_ID,
+      facebookDomainVerification: process.env.FACEBOOK_DOMAIN_VERIFICATION,
+      googleMapApiKey: process.env.GOOGLE_MAPS_API_KEY,
+    };
+    return Mustache.render(template, data);
+  };
+};
+
+export { createHtmlRenderer, renderHtml };
+export default {
+  createHtmlRenderer,
+  renderHtml,
+};

package/src/builder/templates/page.js

@@ -12,7 +12,7 @@ export default `
       <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
       <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
       <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
-      <link rel="manifest" href="/favicon/site.webmanifest">
+      <link rel="manifest" href="/manifest.json">
       <link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#5bbad5">
       <meta name="msapplication-TileColor" content="#000000">
       <meta name="theme-color" content="#ffffff">

package/src/builder/vite/index.js

@@ -1,13 +1,13 @@
 import baseConfig from './vite.config.base.js';
-import clientConfig from './vite.config.client.js';
-import serverConfig from './vite.config.server.js';
-import spaConfig from './vite.config.spa.js';
-import ssrConfig from './vite.config.ssr.js';
-export { baseConfig, clientConfig, serverConfig, spaConfig, ssrConfig };
+import ssrClientConfig from './vite.config.ssr.client.js';
+import apiConfig from './vite.config.api.js';
+import spaClientConfig from './vite.config.spa.client.js';
+import ssrServerConfig from './vite.config.ssr.server.js';
+export { baseConfig, ssrClientConfig, apiConfig, spaClientConfig, ssrServerConfig };
 export default {
   baseConfig,
-  clientConfig,
-  serverConfig,
-  spaConfig,
-  ssrConfig,
+  ssrClientConfig,
+  apiConfig,
+  spaClientConfig,
+  ssrServerConfig,
 };

package/src/builder/vite/vite.config.api.js

@@ -0,0 +1,52 @@
+import { builtinModules } from 'module';
+import path from 'path';
+
+export default projectRoot => {
+  return {
+    // Режим разработки для сервера
+    mode: 'development',
+    
+    // Настройки сборки для Node.js сервера
+    build: {
+      ssr: true,
+      outDir: path.resolve(projectRoot, 'builds/web/server'),
+      emptyOutDir: true,
+      sourcemap: true,
+      minify: false,
+      
+      rollupOptions: {
+        input: path.resolve(projectRoot, 'src/server.js'),
+        output: {
+          format: 'esm', // Используем ESM для современного Node.js
+          entryFileNames: 'server.js',
+        },
+        // Внешние зависимости - не включаем их в бандл
+        external: [
+          ...builtinModules,
+          ...builtinModules.map(m => `node:${m}`),
+          // Все пакеты из node_modules кроме тех, что нужны для бандла
+          /^[^./]/,
+        ],
+      },
+    },
+    
+    // Отключаем оптимизацию для серверного кода
+    optimizeDeps: {
+      disabled: true,
+    },
+    
+    // Настройки разрешения путей
+    resolve: {
+      alias: {
+        '@martyrs': path.resolve(projectRoot, 'martyrs'),
+      },
+    },
+    
+    // SSR настройки для сервера
+    ssr: {
+      target: 'node',
+      // Форматирование ошибок в Node.js стиле
+      format: 'esm',
+    },
+  };
+};

package/src/builder/vite/vite.config.base.js

@@ -42,9 +42,8 @@ export default projectRoot => {
               name: 'bundle-analyzer',
               configResolved(config) {
                 // Динамически импортируем rollup-plugin-visualizer только когда нужно
-                const { visualizer } = rollupPluginVisualizer;
                 config.plugins.push(
-                  visualizer({
+                  rollupPluginVisualizer({
                     open: true,
                     filename: 'stats.html',
                     gzipSize: true,

package/src/builder/vite/{vite.config.spa.js → vite.config.spa.client.js}

@@ -23,7 +23,7 @@ export default projectRoot => {
     },
     // Add HTML plugin for SPA
     plugins: [
-      { createHtmlPlugin }.createHtmlPlugin({
+      createHtmlPlugin({
         minify: isProd,
         inject: {
           data: {