@ozdao/martyrs 0.2.584 → 0.2.586

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.584",
+  "version": "0.2.586",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -15,6 +15,9 @@
     "vue3",
     "express"
   ],
+  "bin": {
+    "martyrs": "./src/cli/index.js"
+  },
   "type": "module",
   "sideEffects": [
     "*.css",
@@ -73,6 +76,7 @@
   },
   "dependencies": {
     "@capacitor/core": "7.4.4",
+    "commander": "12.1.0",
     "@capacitor/preferences": "7.0.2",
     "@googlemaps/google-maps-services-js": "3.4.0",
     "@vitejs/plugin-vue": "6.0.1",

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

@@ -160,6 +160,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       const measure5 = performance.getEntriesByName('loading-5')[0];
       console.log(`[LOADING 5] HTML rendering and Beasties completed in ${measure5?.duration?.toFixed(2)}ms`);
 
+      console.log('[SSR-404] dev renderer returning statusCode:', statusCode);
       return { html: completeHtml, statusCode };
     };
   };
@@ -273,6 +274,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
         res.locals.webpack.devMiddleware // Update to rspack middleware context
       );
 
+      console.log('[SSR-404] sending response with statusCode:', result.statusCode);
       res.status(result.statusCode)
         .header("Content-Type", "text/html; charset=utf-8")
         .send(result.html);

package/src/cli/commands/create.js

@@ -0,0 +1,106 @@
+import { mkdir, readFile, writeFile, readdir, stat, chmod, copyFile } from 'fs/promises';
+import { join, dirname, relative } from 'path';
+import { fileURLToPath } from 'url';
+import Mustache from 'mustache';
+import { execSync } from 'child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const TEMPLATES_DIR = join(__dirname, '../templates');
+
+export async function createProject(projectName, options) {
+  const targetDir = join(process.cwd(), projectName);
+
+  console.log(`\nCreating project: ${projectName}\n`);
+
+  // Контекст для шаблонов
+  const context = {
+    projectName,
+    projectNameLower: projectName.toLowerCase().replace(/[^a-z0-9]/g, ''),
+    martyrsVersion: '^0.2.585',
+    year: new Date().getFullYear(),
+    port: '8040',
+    portNginx: '8041',
+    portWss: '8020',
+  };
+
+  // Копируем шаблоны
+  await copyTemplates(TEMPLATES_DIR, targetDir, context);
+
+  // Делаем скрипты исполняемыми
+  try {
+    await chmod(join(targetDir, 'start-dev.sh'), 0o755);
+    await chmod(join(targetDir, 'start-prod.sh'), 0o755);
+  } catch (e) {
+    // Игнорируем если файлов нет
+  }
+
+  // Git init
+  try {
+    execSync('git init', { cwd: targetDir, stdio: 'pipe' });
+    console.log('✓ Git repository initialized');
+  } catch (e) {
+    console.log('⚠ Git init skipped');
+  }
+
+  // pnpm install
+  if (!options.skipInstall) {
+    console.log('\nInstalling dependencies...\n');
+    try {
+      execSync('pnpm install', { cwd: join(targetDir, 'app'), stdio: 'inherit' });
+      console.log('\n✓ Dependencies installed');
+    } catch (e) {
+      console.log('\n⚠ Install failed. Run manually: cd app && pnpm install');
+    }
+  }
+
+  // Инструкции
+  console.log(`
+═══════════════════════════════════════════
+  Project "${projectName}" created!
+═══════════════════════════════════════════
+
+  Next steps:
+
+  cd ${projectName}/app
+  ${options.skipInstall ? 'pnpm install\n  ' : ''}pnpm dev:nginx
+
+  Then open: http://localhost:${context.portNginx}
+
+═══════════════════════════════════════════
+`);
+}
+
+async function copyTemplates(srcDir, destDir, context) {
+  await mkdir(destDir, { recursive: true });
+
+  const entries = await readdir(srcDir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const srcPath = join(srcDir, entry.name);
+    let destName = entry.name;
+
+    // Убираем .mustache из имени
+    if (destName.endsWith('.mustache')) {
+      destName = destName.replace('.mustache', '');
+    }
+
+    const destPath = join(destDir, destName);
+
+    if (entry.isDirectory()) {
+      await copyTemplates(srcPath, destPath, context);
+    } else {
+      const content = await readFile(srcPath, 'utf8');
+
+      // Обрабатываем .mustache файлы
+      let output = content;
+      if (entry.name.endsWith('.mustache')) {
+        output = Mustache.render(content, context);
+      }
+
+      await mkdir(dirname(destPath), { recursive: true });
+      await writeFile(destPath, output);
+    }
+  }
+}

package/src/cli/index.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+
+import { program } from 'commander';
+import { createProject } from './commands/create.js';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import { readFileSync } from 'fs';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const pkg = JSON.parse(readFileSync(join(__dirname, '../../package.json'), 'utf8'));
+
+program
+  .name('martyrs')
+  .description('CLI for @ozdao/martyrs framework')
+  .version(pkg.version);
+
+program
+  .command('create <project-name>')
+  .description('Create a new martyrs project')
+  .option('--skip-install', 'Skip pnpm install after creation')
+  .action(createProject);
+
+program.parse();

package/src/cli/templates/app/.env.development.mustache

@@ -0,0 +1,14 @@
+NODE_ENV=development
+PORT={{port}}
+PORT_WSS={{portWss}}
+SSL=false
+APP_NAME={{projectName}}
+
+DOMAIN_URL=localhost
+API_URL=http://localhost:{{port}}
+WSS_URL=ws://localhost:{{portNginx}}/api/ws
+
+DB_ADDRESS='mongodb://localhost:27017/{{projectNameLower}}?authSource=admin'
+SECRET_KEY=change-me-in-production
+
+GOOGLE_TAG_ID=

package/src/cli/templates/app/.env.production.mustache

@@ -0,0 +1,14 @@
+NODE_ENV=production
+PORT=8080
+PORT_WSS=8020
+SSL=false
+APP_NAME={{projectName}}
+
+DOMAIN_URL=example.com
+API_URL=https://example.com
+WSS_URL=wss://example.com/api/ws
+
+DB_ADDRESS='mongodb://user:password@localhost:27017/{{projectNameLower}}?authSource=admin'
+SECRET_KEY=change-me-in-production
+
+GOOGLE_TAG_ID=

package/src/cli/templates/app/Dockerfile

@@ -0,0 +1,36 @@
+FROM node:22.14.0-alpine
+
+WORKDIR /app
+
+RUN apk update && apk upgrade && apk add --no-cache \
+    build-base \
+    git \
+    make \
+    gcc \
+    g++ \
+    libc6-compat \
+    vips-dev \
+    python3 \
+    py3-setuptools \
+    linux-headers \
+    libuv-dev \
+    openssl-dev \
+    zlib-dev
+
+COPY app/package*.json ./
+COPY public/sw.js public/sw.js
+
+RUN corepack enable
+RUN corepack prepare pnpm@latest --activate
+
+RUN pnpm install
+
+COPY app/ .
+
+ENV TZ=Europe/Moscow
+
+EXPOSE 8080
+
+RUN pnpm run build
+
+CMD ["pnpm", "run", "start"]

package/src/cli/templates/app/babel.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        useBuiltIns: 'usage',
+        corejs: { version: 3, proposals: true },
+        debug: false,
+      },
+    ],
+    ['@babel/preset-flow']
+  ],
+  plugins:['@babel/transform-runtime'],
+};

package/src/cli/templates/app/env.js

@@ -0,0 +1,3 @@
+import dotenv from 'dotenv';
+
+dotenv.config({ path: `.env.${process.env.NODE_ENV}` });

package/src/cli/templates/app/index.js

@@ -0,0 +1,46 @@
+import './env.js';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { rspack } from '@rspack/core';
+
+const __filename = fileURLToPath(import.meta.url);
+const projectRoot = path.dirname(__filename);
+
+const command = process.argv[2];
+const MODE = process.env.MODE || 'SSR';
+const isDev = process.env.NODE_ENV !== 'production';
+
+import {
+  createSsrRspackDevServer,
+  createSsrProdServer,
+  createSpaRspackDevServer,
+  createSpaProdServer,
+  rspackConfigs
+} from '@ozdao/martyrs/builder';
+import createServer from './src/server.js';
+
+const configs = {
+  api: rspackConfigs.apiConfig(projectRoot),
+  spa: rspackConfigs.spaConfig(projectRoot),
+  client: rspackConfigs.clientConfig(projectRoot),
+  ssr: rspackConfigs.ssrConfig(projectRoot)
+};
+
+if (command === 'build') {
+  const toBuild = MODE === 'SSR' ? [configs.client, configs.ssr] : [configs.spa];
+
+  for (const config of toBuild) {
+    const compiler = rspack(config);
+    await new Promise(resolve => compiler.run(() => compiler.close(resolve)));
+  }
+
+  console.log('Build done');
+  process.exit(0);
+}
+
+const serverFunc = MODE === 'SSR'
+  ? (isDev ? createSsrRspackDevServer : createSsrProdServer)
+  : (isDev ? createSpaRspackDevServer : createSpaProdServer);
+
+const start = serverFunc(projectRoot, configs, createServer);
+start();

package/src/cli/templates/app/mongodb.config.js

@@ -0,0 +1,18 @@
+let adressDB = process.env.DB_ADDRESS;
+
+import db from "./src/models/index.js";
+
+db.mongoose
+  .connect(adressDB, {
+    connectTimeoutMS: 20000,
+    socketTimeoutMS: 50000,
+  })
+  .then(() => {
+    console.log("Successfully connect to MongoDB.");
+  })
+  .catch(err => {
+    console.error("Connection error", err);
+    process.exit();
+  });
+
+export default db;

package/src/cli/templates/app/package.json.mustache

@@ -0,0 +1,65 @@
+{
+  "name": "{{projectName}}",
+  "version": "0.0.1",
+  "description": "Project created with @ozdao/martyrs",
+  "author": "",
+  "license": "ISC",
+  "private": true,
+  "type": "module",
+  "main": "./index.js",
+  "scripts": {
+    "preinstall": "npx only-allow pnpm",
+    "dev": "NODE_ENV=development node --loader esm-module-alias/loader index.js",
+    "dev:spa": "NODE_ENV=development MODE=SPA node --loader esm-module-alias/loader index.js",
+    "dev:nginx": "../start-dev.sh",
+    "build": "NODE_ENV=production node --loader esm-module-alias/loader index.js build",
+    "build:spa": "NODE_ENV=production MODE=SPA node --loader esm-module-alias/loader index.js build",
+    "start": "NODE_ENV=production node --loader esm-module-alias/loader index.js",
+    "start:nginx": "../start-prod.sh"
+  },
+  "dependencies": {
+    "@ozdao/martyrs": "{{martyrsVersion}}",
+    "@rspack/cli": "1.5.3",
+    "@unhead/ssr": "1.9.16",
+    "@unhead/vue": "1.9.16",
+    "@vue/compiler-sfc": "3.4.38",
+    "@vue/server-renderer": "3.5.13",
+    "axios": "1.7.4",
+    "cookie-parser": "1.4.6",
+    "cors": "2.8.5",
+    "express": "4.19.2",
+    "js-cookie": "3.0.5",
+    "mongodb": "6.8.0",
+    "mongoose": "8.5.3",
+    "mustache": "4.2.0",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.56.0",
+    "vue": "3.5.13",
+    "vue-i18n": "9.14.0",
+    "vue-router": "4.4.3",
+    "webpack-dev-middleware": "7.3.0"
+  },
+  "devDependencies": {
+    "@babel/core": "7.25.2",
+    "@babel/plugin-transform-runtime": "7.24.7",
+    "@babel/preset-env": "7.25.3",
+    "@babel/preset-flow": "7.24.7",
+    "@babel/runtime": "7.27.0",
+    "@rspack/core": "1.5.3",
+    "babel-loader": "9.1.3",
+    "body-parser": "1.20.2",
+    "core-js": "3.38.0",
+    "css-loader": "7.1.2",
+    "dotenv": "16.4.5",
+    "esm-module-alias": "2.2.1",
+    "only-allow": "1.2.1",
+    "sass": "1.77.8",
+    "sass-loader": "16.0.0",
+    "vue-loader": "17.4.2"
+  },
+  "aliases": {
+    "@": "./src"
+  },
+  "_moduleAliases": {
+    "@": "./src"
+  }
+}

package/src/cli/templates/app/src/client.js

@@ -0,0 +1,22 @@
+import 'martyrs-jit.css';
+import '@/scss/theme.scss';
+
+import { createUniversalApp } from '@ozdao/martyrs/modules/core/client';
+
+import { getConfig } from '@/configs/global.config.js';
+import { getRouter } from '@/router/index.js';
+import { getStore } from '@/store/index.js';
+import { getLocales } from '@/localization/index.js';
+
+const appPromise = createUniversalApp({
+  getConfig,
+  getRouter,
+  getLocales,
+  getStore,
+});
+
+export async function _renderApp({ url, cookies, languages, ssrContext }) {
+  const { renderApp } = await appPromise;
+
+  return renderApp({ url, cookies, languages, ssrContext });
+}

package/src/cli/templates/app/src/components/pages/Index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="wrapper pd-medium">
+    <div class="flex flex-column gap-medium align-center justify-center h-100vh">
+      <h1 class="t-center">{{ $t('welcome') }}</h1>
+      <p class="t-dark-semi t-center">Your martyrs project is ready!</p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+</script>

package/src/cli/templates/app/src/configs/global.config.js.mustache

@@ -0,0 +1,40 @@
+export async function getConfig() {
+  return {
+    env: {
+      isMobileApp: process.env.MOBILE_APP || false,
+    },
+
+    core: {
+      websocket: true,
+    },
+
+    app: {
+      support: {
+        url: 'https://t.me/support'
+      },
+      messages: {
+        en: {
+          meta: {
+            title: '{{projectName}}',
+            description: 'Project built with @ozdao/martyrs',
+          },
+        },
+        ru: {
+          meta: {
+            title: '{{projectName}}',
+            description: 'Проект на @ozdao/martyrs',
+          },
+        }
+      }
+    },
+
+    modules: {
+      auth: {
+        loader: () => import('@ozdao/martyrs/modules/auth/client'),
+        routes: ['/'],
+        priority: 'high',
+        dependencies: []
+      },
+    },
+  };
+}

package/src/cli/templates/app/src/localization/extensions.js

@@ -0,0 +1,2 @@
+export default {
+};

package/src/cli/templates/app/src/localization/index.js

@@ -0,0 +1,44 @@
+import { createI18n } from 'vue-i18n';
+import { i18nManager } from '@ozdao/martyrs/modules/core/client';
+
+import translations from './translations.js';
+import overrides from './overrides.js';
+import extensions from './extensions.js';
+
+const supportedLocales = {
+  en: "🇬🇧 EN",
+  ru: "🇷🇺 RU"
+};
+
+export function getLocales() {
+  if (translations) {
+    Object.entries(translations).forEach(([module, locales]) => {
+      i18nManager.register(module, locales);
+    });
+  }
+
+  if (extensions) {
+    Object.entries(extensions).forEach(([module, locales]) => {
+      i18nManager.extend(module, locales);
+    });
+  }
+
+  if (overrides) {
+    Object.entries(overrides).forEach(([module, locales]) => {
+      i18nManager.override(module, locales);
+    });
+  }
+
+  const messages = i18nManager.getAllMessages();
+
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    fallbackLocale: 'en',
+    messages,
+    globalInjection: true,
+    availableLocales: Object.keys(supportedLocales),
+  });
+
+  return i18n;
+}

package/src/cli/templates/app/src/localization/overrides.js

@@ -0,0 +1,2 @@
+export default {
+};

package/src/cli/templates/app/src/localization/translations.js

@@ -0,0 +1,10 @@
+export default {
+  app: {
+    en: {
+      welcome: 'Welcome',
+    },
+    ru: {
+      welcome: 'Добро пожаловать',
+    }
+  }
+};

package/src/cli/templates/app/src/models/index.js

@@ -0,0 +1,9 @@
+import mongoose from 'mongoose';
+
+mongoose.Promise = global.Promise;
+
+const db = { mongoose: mongoose };
+
+db.ROLES = ["user", "admin", "moderator"];
+
+export default db;

package/src/cli/templates/app/src/router/index.js

@@ -0,0 +1,48 @@
+import {
+  createRouter,
+  createMemoryHistory,
+  createWebHistory,
+} from 'vue-router';
+
+import { scrollBehavior, layoutClient, Header, Sidebar, Navigation, NavigationBar } from '@ozdao/martyrs/modules/core/client';
+
+const isServer = typeof window === 'undefined';
+
+let history = isServer ? createMemoryHistory() : createWebHistory();
+
+const routes = [{
+  path: '/:locale?',
+
+  components: {
+    default: layoutClient
+  },
+
+  name: 'Home',
+
+  meta: {
+    header: Header,
+    sidebar: Sidebar,
+    sidebar_navigation: Navigation,
+    navigationbar: NavigationBar,
+  },
+
+  children: [{
+    path: '',
+    name: "Index",
+    meta: {
+      title: {
+        en: 'Home',
+        ru: 'Главная'
+      },
+    },
+    component: () => import('@/components/pages/Index.vue'),
+  }]
+}];
+
+export function getRouter() {
+  return createRouter({
+    routes,
+    history,
+    scrollBehavior
+  });
+}

package/src/cli/templates/app/src/scss/theme.scss

@@ -0,0 +1,18 @@
+@import '/node_modules/@ozdao/martyrs/dist/style.css';
+@import '/node_modules/@ozdao/martyrs/src/styles/theme.scss';
+
+:root {
+  color-scheme: light dark;
+
+  --main: 59, 130, 246;
+  --second: 139, 92, 246;
+  --third: 34, 197, 94;
+
+  --black: 0, 0, 0;
+  --dark: 64, 64, 64;
+  --grey: 156, 163, 175;
+  --light: 243, 244, 246;
+  --white: 255, 255, 255;
+
+  --font: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
+}

package/src/cli/templates/app/src/server.js

@@ -0,0 +1,68 @@
+import path from 'path';
+import express from 'express';
+import cors from 'cors';
+import cookies from 'cookie-parser';
+import http from 'http';
+import dotenv from 'dotenv';
+import { fileURLToPath } from 'url';
+
+import core from '@ozdao/martyrs/modules/core/server';
+import auth from '@ozdao/martyrs/modules/auth/server';
+import db from '../mongodb.config.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+dotenv.config({ path: `.env.${process.env.NODE_ENV}` });
+
+const port = process.env.PORT || 8080;
+const publicPath = path.join(__dirname, '../../public');
+
+const createServer = async () => {
+  const app = express();
+
+  const allowedOrigins = [
+    process.env.API_URL,
+    'http://localhost',
+    'http://localhost:8080',
+    'http://localhost:8040',
+    'http://localhost:8041',
+    'http://localhost:3000',
+  ];
+
+  app.use(cors({
+    credentials: true,
+    origin: (origin, callback) => {
+      if (allowedOrigins.includes(origin) || !origin) {
+        callback(null, true);
+      } else {
+        callback(new Error('Origin not allowed by CORS'));
+      }
+    },
+  }));
+
+  app.set("trust proxy", 1);
+  app.use(express.json());
+  app.use(express.urlencoded({ extended: true }));
+  app.use(cookies());
+  app.use(express.static(path.resolve(__dirname, "../../public")));
+
+  const server = http.createServer(app);
+
+  const wss = await core.WebSocketManager();
+
+  wss.listen(process.env.PORT_WSS || 8020, () => {
+    console.log(`WebSocket server listening on port ${process.env.PORT_WSS || 8020}`);
+  });
+
+  core.initialize(app, db, allowedOrigins, publicPath);
+  auth.initialize(app, db, allowedOrigins, publicPath);
+
+  return { app, server };
+};
+
+export { createServer };
+
+export default {
+  createServer
+};