@ozdao/martyrs 0.2.489 → 0.2.491

package/dist/_virtual/index.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const _commonjsHelpers = require("./_commonjsHelpers.cjs");
-const index = require("../node_modules/fast-deep-equal/index.cjs");
-var fastDeepEqualExports = index.__require();
-const equal = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(fastDeepEqualExports);
-exports.default = equal;
+const index = require("../node_modules/lodash.merge/index.cjs");
+var lodash_mergeExports = index.__require();
+const merge = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(lodash_mergeExports);
+exports.default = merge;
 //# sourceMappingURL=index.cjs.map

package/dist/_virtual/index.js

@@ -1,8 +1,8 @@
 import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
-import { __require as requireFastDeepEqual } from "../node_modules/fast-deep-equal/index.js";
-var fastDeepEqualExports = requireFastDeepEqual();
-const equal = /* @__PURE__ */ getDefaultExportFromCjs(fastDeepEqualExports);
+import { __require as requireLodash_merge } from "../node_modules/lodash.merge/index.js";
+var lodash_mergeExports = requireLodash_merge();
+const merge = /* @__PURE__ */ getDefaultExportFromCjs(lodash_mergeExports);
 export {
-  equal as default
+  merge as default
 };
 //# sourceMappingURL=index.js.map

package/dist/_virtual/index2.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const _commonjsHelpers = require("./_commonjsHelpers.cjs");
-const index = require("../node_modules/lodash.merge/index.cjs");
-var lodash_mergeExports = index.__require();
-const merge = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(lodash_mergeExports);
-exports.default = merge;
+const index = require("../node_modules/fast-deep-equal/index.cjs");
+var fastDeepEqualExports = index.__require();
+const equal = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(fastDeepEqualExports);
+exports.default = equal;
 //# sourceMappingURL=index2.cjs.map

package/dist/_virtual/index2.js

@@ -1,8 +1,8 @@
 import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
-import { __require as requireLodash_merge } from "../node_modules/lodash.merge/index.js";
-var lodash_mergeExports = requireLodash_merge();
-const merge = /* @__PURE__ */ getDefaultExportFromCjs(lodash_mergeExports);
+import { __require as requireFastDeepEqual } from "../node_modules/fast-deep-equal/index.js";
+var fastDeepEqualExports = requireFastDeepEqual();
+const equal = /* @__PURE__ */ getDefaultExportFromCjs(fastDeepEqualExports);
 export {
-  merge as default
+  equal as default
 };
 //# sourceMappingURL=index2.js.map

package/dist/auth.server.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const crypto = require("crypto");
+const profile_schema = require("./profile.schema-pidHrksV.cjs");
 const index = require("./index-BFxqqmgh.cjs");
 const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
@@ -9,56 +9,7 @@ const jwkToPem = require("jwk-to-pem");
 const mailing = require("./mailing-q7sR8gCV.cjs");
 const addUserStatusFields = require("./addUserStatusFields-7-66sf45.cjs");
 const credentials_schema = require("./credentials.schema-DwhGdrwC.cjs");
-const profile_schema = require("./profile.schema-yQuIzngl.cjs");
 const socials_schema = require("./socials.schema-CtpSF9dE.cjs");
-const fingerprintCache = /* @__PURE__ */ new Map();
-const generateFingerprint = (req) => {
-  const { ip, headers } = req;
-  const userAgent = headers["user-agent"];
-  const acceptLanguage = headers["accept-language"];
-  const key = `${ip}-${userAgent}-${acceptLanguage}`;
-  if (fingerprintCache.has(key)) {
-    return fingerprintCache.get(key);
-  }
-  const hash = crypto.createHash("sha256");
-  hash.update(key);
-  const digest = hash.digest("hex");
-  fingerprintCache.set(key, digest);
-  return digest;
-};
-const modelsFactory = (db) => {
-  const Visitor = db.visitor;
-  const Request = db.request;
-  const visitorLogger = async (req, res, next) => {
-    const fingerprint = generateFingerprint(req);
-    try {
-      let visitor = await Visitor.findOne({ fingerprint });
-      if (!visitor) {
-        visitor = new Visitor({
-          ip: req.ip,
-          userAgent: req.headers["user-agent"],
-          acceptLanguage: req.headers["accept-language"],
-          fingerprint
-        });
-        await visitor.save();
-      }
-      const newRequest = new Request({
-        visitor: visitor._id,
-        path: req.path,
-        method: req.method,
-        timestamp: /* @__PURE__ */ new Date()
-      });
-      await newRequest.save();
-      next();
-    } catch (error) {
-      console.error("Error processing visitor and request data:", error);
-      next();
-    }
-  };
-  return {
-    visitorLogger
-  };
-};
 async function verifyAppleIdToken(id_token) {
   const decodedToken = jwt.decode(id_token, { complete: true });
   if (!decodedToken) {
@@ -547,7 +498,7 @@ function initializeAuth(app, db, origins, publicPath) {
     authRoutes(app, db);
     twofaRoutes(app, db);
     usersRoutes(app, db);
-    const visitorModule = modelsFactory(db);
+    const visitorModule = profile_schema.modelsFactory(db);
     app.use(visitorModule.visitorLogger);
   }
 }

package/dist/auth.server.js

@@ -1,4 +1,4 @@
-import crypto from "crypto";
+import { a as applyProfileSchema, m as modelsFactory } from "./profile.schema-BGAe5VN5.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
 import bcrypt from "bcryptjs";
 import jwt from "jsonwebtoken";
@@ -7,56 +7,7 @@ import jwkToPem from "jwk-to-pem";
 import { m as mailing } from "./mailing-C11EYWm-.js";
 import { a as addUserStatusFields, b as addMembersQuantity } from "./addUserStatusFields-Cc-JpmPo.js";
 import { a as applyCredentialsSchema } from "./credentials.schema-C9FB2EyY.js";
-import { a as applyProfileSchema } from "./profile.schema-DchVS-Jr.js";
 import { a as applySocialsSchema } from "./socials.schema-BOZV82Mp.js";
-const fingerprintCache = /* @__PURE__ */ new Map();
-const generateFingerprint = (req) => {
-  const { ip, headers } = req;
-  const userAgent = headers["user-agent"];
-  const acceptLanguage = headers["accept-language"];
-  const key = `${ip}-${userAgent}-${acceptLanguage}`;
-  if (fingerprintCache.has(key)) {
-    return fingerprintCache.get(key);
-  }
-  const hash = crypto.createHash("sha256");
-  hash.update(key);
-  const digest = hash.digest("hex");
-  fingerprintCache.set(key, digest);
-  return digest;
-};
-const modelsFactory = (db) => {
-  const Visitor = db.visitor;
-  const Request = db.request;
-  const visitorLogger = async (req, res, next) => {
-    const fingerprint = generateFingerprint(req);
-    try {
-      let visitor = await Visitor.findOne({ fingerprint });
-      if (!visitor) {
-        visitor = new Visitor({
-          ip: req.ip,
-          userAgent: req.headers["user-agent"],
-          acceptLanguage: req.headers["accept-language"],
-          fingerprint
-        });
-        await visitor.save();
-      }
-      const newRequest = new Request({
-        visitor: visitor._id,
-        path: req.path,
-        method: req.method,
-        timestamp: /* @__PURE__ */ new Date()
-      });
-      await newRequest.save();
-      next();
-    } catch (error) {
-      console.error("Error processing visitor and request data:", error);
-      next();
-    }
-  };
-  return {
-    visitorLogger
-  };
-};
 async function verifyAppleIdToken(id_token) {
   const decodedToken = jwt.decode(id_token, { complete: true });
   if (!decodedToken) {

package/dist/builder.cjs

@@ -17,9 +17,10 @@ const Dotenv = require("dotenv-webpack");
 const glob = require("glob-all");
 const webpackMerge = require("webpack-merge");
 const webpackStatsPlugin = require("webpack-stats-plugin");
+const workboxRspackPlugin = require("@aaroon/workbox-rspack-plugin");
 const purgecssWebpackPlugin = require("purgecss-webpack-plugin");
-const nodeExternals = require("webpack-node-externals");
 const rspackManifestPlugin = require("rspack-manifest-plugin");
+const nodeExternals = require("webpack-node-externals");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
@@ -165,7 +166,7 @@ const template = `
       <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">
@@ -792,6 +793,48 @@ const clientConfig$1 = (projectRoot) => {
             extensions: ["vue", "js", "css", "scss"]
           }
         ]
+      }),
+      // PWA: инжектим манифест в существующий sw.js
+      new workboxRspackPlugin.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.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: {
@@ -912,7 +955,7 @@ const spaConfig$1 = (projectRoot) => {
         },
         filename: "index.html",
         inject: "body"
-      })
+      }),
       // new rspack.CopyRspackPlugin({
       //   patterns: [
       //     { from: path.resolve(projectRoot, "../public/logo"), to: 'logo' },
@@ -920,7 +963,50 @@ const spaConfig$1 = (projectRoot) => {
       //     { from: path.resolve(projectRoot, "../public/icons"), to: 'icons' }
       //   ]
       // })
-      // new ServiceWorkerPlugin()
+      // PWA: инжектим манифест в существующий sw.js (унифицированно с SSR)
+      new workboxRspackPlugin.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.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$1.SwcJsMinimizerRspackPlugin(), , new rspack$1.LightningCssMinimizerRspackPlugin()]

package/dist/builder.js

@@ -16,9 +16,10 @@ import Dotenv from "dotenv-webpack";
 import glob from "glob-all";
 import { merge } from "webpack-merge";
 import { StatsWriterPlugin } from "webpack-stats-plugin";
+import { InjectManifest } from "@aaroon/workbox-rspack-plugin";
 import { PurgeCSSPlugin } from "purgecss-webpack-plugin";
-import nodeExternals from "webpack-node-externals";
 import { RspackManifestPlugin } from "rspack-manifest-plugin";
+import nodeExternals from "webpack-node-externals";
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import CssMinimizerPlugin from "css-minimizer-webpack-plugin";
 import TerserPlugin from "terser-webpack-plugin";
@@ -146,7 +147,7 @@ const template = `
       <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">
@@ -773,6 +774,48 @@ const clientConfig$1 = (projectRoot) => {
             extensions: ["vue", "js", "css", "scss"]
           }
         ]
+      }),
+      // 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: {
@@ -893,7 +936,7 @@ const spaConfig$1 = (projectRoot) => {
         },
         filename: "index.html",
         inject: "body"
-      })
+      }),
       // new rspack.CopyRspackPlugin({
       //   patterns: [
       //     { from: path.resolve(projectRoot, "../public/logo"), to: 'logo' },
@@ -901,7 +944,50 @@ const spaConfig$1 = (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$1.SwcJsMinimizerRspackPlugin(), , new rspack$1.LightningCssMinimizerRspackPlugin()]