Merge pull request #90 from fccview/develop

2.2.0

Author: fccview

app/_utils/line-manipulation-utils.ts

@@ -316,11 +316,19 @@ export const parseJobsFromLines = (
         const nextLine = lines[i + 1].trim();
         if (nextLine.startsWith("# ")) {
           const commentedCron = nextLine.substring(2);
-          const parts = commentedCron.split(/\s+/);
-          if (parts.length >= 6) {
-            const schedule = parts.slice(0, 5).join(" ");
-            const command = parts.slice(5).join(" ");
+          const parts = commentedCron.split(/(?:\s|\t)+/);
+          let schedule: string | undefined;
+          let command: string | undefined;
+
+          if (parts[0].startsWith("@") && parts.length >= 2) {
+            schedule = parts[0];
+            command = commentedCron.slice(commentedCron.indexOf(parts[1]));
+          } else if (parts.length >= 6) {
+            schedule = parts.slice(0, 5).join(" ");
+            command = commentedCron.slice(commentedCron.indexOf(parts[5]));
+          }
 
+          if (schedule && command) {
             const jobId =
               uuid || generateStableJobId(schedule, command, user, comment, i);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronjob-manager",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -36,8 +36,8 @@
     "cronstrue": "^3.2.0",
     "fflate": "^0.8.2",
     "jose": "^6.1.1",
-    "minimatch": "^10.0.3",
-    "next": "16.1.6",
+    "minimatch": "^10.2.3",
+    "next": "16.2.1",
     "next-intl": "^4.4.0",
     "next-themes": "^0.2.1",
     "postcss": "^8",
@@ -46,7 +46,7 @@
     "react-dom": "19.2.4",
     "react-syntax-highlighter": "^15.6.1",
     "serwist": "^9.5.5",
-    "systeminformation": "^5.27.14",
+    "systeminformation": "^5.31.0",
     "tailwind-merge": "^2.0.0",
     "tailwindcss": "^3.3.0",
     "typescript": "^5"
@@ -56,15 +56,22 @@
     "@types/bcryptjs": "^2.4.6",
     "@types/minimatch": "^6.0.0",
     "eslint": "^9",
-    "eslint-config-next": "16.1.6",
+    "eslint-config-next": "16.2.1",
     "postcss-import": "^16.1.1"
   },
   "resolutions": {
     "@isaacs/brace-expansion": "^5.0.1",
+    "eslint/minimatch": "^3.1.3",
+    "@eslint/config-array/minimatch": "^3.1.3",
+    "@eslint/eslintrc/minimatch": "^3.1.3",
+    "eslint-plugin-import/minimatch": "^3.1.3",
+    "eslint-plugin-jsx-a11y/minimatch": "^3.1.3",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "lodash": "^4.17.23",
     "prismjs": "^1.30.0",
-    "systeminformation": "^5.27.14"
+    "systeminformation": "^5.31.0",
+    "ajv": "^6.14.0",
+    "flatted": "^3.4.2"
   }
 }

proxy.ts

@@ -99,6 +99,7 @@ export const proxy = async (request: NextRequest) => {
     }
   } catch (error) {
     console.error("Session check error:", error);
+    return NextResponse.redirect(loginUrl);
   }
 
   const response = NextResponse.next();