@ludo.ninja/components 2.3.67 → 2.3.69

package/build/utils/withTimestampSSR/index.d.ts

@@ -1,8 +1,9 @@
 import { GetServerSideProps } from 'next';
+export declare const hashString: (str: string) => number;
 export type TimestampProps = {
     isoTimestamp: string;
     displayTimestamp: string;
     checksum: number;
+    currentUrl: string;
 };
-export declare function withTimestampSSR<P extends Record<string, any>>(getServerSideProps: GetServerSideProps<P>): GetServerSideProps<P & TimestampProps>;
-export declare function withTimestampSSR(): GetServerSideProps<TimestampProps>;
+export declare const withTimestampSSR: <P extends Record<string, any>>(getServerSideProps?: GetServerSideProps<P>) => GetServerSideProps<P & TimestampProps> | GetServerSideProps<TimestampProps>;

package/build/utils/withTimestampSSR/index.js

@@ -1,20 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withTimestampSSR = withTimestampSSR;
+exports.withTimestampSSR = exports.hashString = void 0;
 let lastTimestamp = 0;
-function hashString(str) {
+const hashString = (str) => {
     let hash = 0;
     for (let i = 0; i < str.length; i++) {
         hash = (hash << 5) - hash + str.charCodeAt(i);
         hash |= 0;
     }
     return Math.abs(hash);
-}
-function withTimestampSSR(getServerSideProps) {
+};
+exports.hashString = hashString;
+const withTimestampSSR = (getServerSideProps) => {
     return async (context) => {
         const now = Date.now();
-        const url = context.resolvedUrl || '/';
-        const hash = hashString(url);
+        const req = context.req;
+        const protocol = req.headers['x-forwarded-proto'] || 'http';
+        const host = req.headers.host;
+        const path = context.resolvedUrl;
+        const fullUrl = `${protocol}://${host}${path}`;
+        const hash = (0, exports.hashString)(fullUrl);
         const secondsAgo = (hash % 59) + 2;
         let proposedTimestamp = now - secondsAgo * 1000;
         if (proposedTimestamp <= lastTimestamp) {
@@ -31,7 +36,7 @@ function withTimestampSSR(getServerSideProps) {
             minute: '2-digit',
             second: '2-digit',
         });
-        const checksum = hashString(url + isoTimestamp);
+        const checksum = (0, exports.hashString)(fullUrl + isoTimestamp);
         if (getServerSideProps) {
             const result = await getServerSideProps(context);
             if ('props' in result) {
@@ -41,6 +46,7 @@ function withTimestampSSR(getServerSideProps) {
                         isoTimestamp,
                         displayTimestamp,
                         checksum,
+                        currentUrl: fullUrl,
                     },
                 };
             }
@@ -51,7 +57,9 @@ function withTimestampSSR(getServerSideProps) {
                 isoTimestamp,
                 displayTimestamp,
                 checksum,
+                currentUrl: fullUrl,
             },
         };
     };
-}
+};
+exports.withTimestampSSR = withTimestampSSR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludo.ninja/components",
-  "version": "2.3.67",
+  "version": "2.3.69",
   "private": false,
   "main": "build/index.js",
   "types": "build/index.d.ts",