npm - mjpic - Versions diffs - 1.0.6 → 1.0.8 - Mend

mjpic 1.0.6 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/dist/client/index.html CHANGED Viewed

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="敏捷图片（mjpic）是一个轻量级网页版图片处理工具，设计灵感来源于光影魔术手。" />
     <title>敏捷图片 (mjpic) - 轻量级网页版图片处理工具</title>
-    <script type="module" crossorigin src="/assets/index-BQfYCBRX.js"></script>
+    <script type="module" crossorigin src="/assets/index-C4AVPLLP.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BoiS81Ei.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "mjpic",
   "description": "敏捷图片（mjpic）是一个轻量级网页版图片处理工具，设计灵感来源于光影魔术手。",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "bin": {
     "mjpic": "./dist/cli/cli.js"
@@ -14,8 +14,8 @@
     "lint": "eslint .",
     "preview": "vite preview",
     "check": "tsc --noEmit",
-    "server:dev": "nodemon",
-    "dev": "concurrently \"npm run client:dev\" \"npm run server:dev\""
+    "server:dev": "PORT=${PORT:-3002} nodemon",
+    "dev": "export PORT=$(node scripts/get-random-port.js) && export CLIENT_PORT=$(node scripts/get-random-port.js) && echo \"Starting Backend on $PORT, Frontend on $CLIENT_PORT\" && concurrently \"npm run client:dev\" \"npm run server:dev\""
   },
   "dependencies": {
     "@dnd-kit/core": "^6.3.1",
@@ -30,6 +30,7 @@
     "i18next-browser-languagedetector": "^8.2.1",
     "konva": "^9.3.16",
     "lucide-react": "^0.511.0",
+    "mjpic": "^1.0.7",
     "open": "^11.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package/scripts/get-random-port.js ADDED Viewed

@@ -0,0 +1,40 @@
+import net from 'net';
+// Check if a port is available
+const isPortAvailable = (port) => {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    server.once('error', () => resolve(false));
+    server.once('listening', () => {
+      server.close();
+      resolve(true);
+    });
+    server.listen(port);
+  });
+};
+// Generate a random port between min and max, excluding common ports
+const getRandomPort = async () => {
+  const commonPorts = [3000, 5000, 5173, 8000, 8080, 8888, 4200];
+  const min = 10000;
+  const max = 65535;
+  // Try up to 50 times to find a port
+  for (let i = 0; i < 50; i++) {
+    const port = Math.floor(Math.random() * (max - min + 1) + min);
+    if (!commonPorts.includes(port) && await isPortAvailable(port)) {
+      return port;
+    }
+  }
+  // Fallback to 0 (let OS choose)
+  return 0;
+};
+// Run if called directly
+const run = async () => {
+  const port = await getRandomPort();
+  console.log(port);
+};
+run();

package/src/components/dialogs/SaveDialog.tsx CHANGED Viewed

@@ -137,7 +137,7 @@ export const SaveDialog = ({ isOpen, onClose, onConfirm, defaultPath, defaultFil
               {t('common.cancel')}
             </button>
             <button
-              onClick={() => onConfirm(format, quality / 100, savePath, fileName)}
+              onClick={() => onConfirm(format, quality, savePath, fileName)}
               className="flex-1 px-3 py-2 rounded bg-blue-600 hover:bg-blue-500 text-white text-sm transition-colors"
             >
               {t('common.confirm')}

package/src/components/layout/Header.tsx CHANGED Viewed

@@ -39,30 +39,55 @@ export const Header = ({ stageRef }: HeaderProps) => {
     if (!stageRef.current) return;
     try {
-        // Find the image node to get current scale
-        const imageNode = stageRef.current.findOne('Image') as Konva.Image;
-        // Find the content group (which contains image + border)
-        const contentGroup = stageRef.current.findOne('#content-group') as Konva.Group;
+        // Get the current state from the image store
+        const { previewImage, config, originalWidth, originalHeight } = useImageStore.getState();
-        if (!imageNode || !contentGroup) {
-            console.error('No image or content group found to save');
+        if (!previewImage) {
+            console.error('No image found to save');
             return;
         }
-        // Store current scale to restore later
-        const currentScaleX = imageNode.scaleX();
-        // Calculate pixelRatio needed to get original resolution
-        // The content is scaled down by currentScaleX to fit screen.
-        // We need to scale it back up by 1/currentScaleX.
-        const pixelRatio = 1 / currentScaleX;
-        const dataUrl = contentGroup.toDataURL({
-            pixelRatio: pixelRatio,
-            mimeType: format,
-            quality: quality
+        // Determine the final dimensions based on resize config
+        let finalWidth = originalWidth || 800;
+        let finalHeight = originalHeight || 600;
+        if (config.resize && config.resize.width > 0 && config.resize.height > 0) {
+            finalWidth = config.resize.width;
+            finalHeight = config.resize.height;
+        }
+        // Create a temporary canvas with the correct dimensions
+        const canvas = document.createElement('canvas');
+        canvas.width = finalWidth;
+        canvas.height = finalHeight;
+        const ctx = canvas.getContext('2d');
+        if (!ctx) {
+            console.error('Failed to create canvas context');
+            return;
+        }
+        // Set high quality rendering
+        ctx.imageSmoothingEnabled = true;
+        ctx.imageSmoothingQuality = 'high';
+        // Load the preview image as the source
+        const img = new Image();
+        img.crossOrigin = 'anonymous';
+        await new Promise<void>((resolve, reject) => {
+            img.onload = () => {
+                // Draw the image with the correct dimensions
+                ctx.drawImage(img, 0, 0, finalWidth, finalHeight);
+                resolve();
+            };
+            img.onerror = reject;
+            img.src = previewImage;
         });
+        // Convert canvas to data URL with correct quality
+        const dataUrl = canvas.toDataURL(format, quality / 100);
         // Check if we are in CLI mode with an opened file
         // If savePath is provided (from dialog), use it
         if (savePath) {

package/src/components/layout/RightPanel.tsx CHANGED Viewed

@@ -428,27 +428,6 @@ export const RightPanel = () => {
                 <label htmlFor="maintainAspectRatio" className="text-xs text-zinc-400 cursor-pointer">{t('common.lockAspectRatio')}</label>
               </div>
             </div>
-            <div className="flex gap-3 mt-2">
-              <button
-                onClick={() => {
-                  // 确定按钮的逻辑
-                  // 这里可以添加额外的验证或处理
-                }}
-                className="flex-1 bg-blue-600 hover:bg-blue-700 text-white py-2 rounded text-sm font-medium"
-              >
-                {t('common.confirm')}
-              </button>
-              <button
-                onClick={() => {
-                  // 取消按钮的逻辑
-                  // 可以重置为之前的尺寸或保持不变
-                }}
-                className="flex-1 bg-zinc-700 hover:bg-zinc-600 text-zinc-200 py-2 rounded text-sm"
-              >
-                {t('common.cancel')}
-              </button>
-            </div>
           </div>
         </div>
       )}

package/vite.config.ts CHANGED Viewed

@@ -15,9 +15,11 @@ export default defineConfig({
     tsconfigPaths(),
   ],
   server: {
+    port: parseInt(process.env.CLIENT_PORT || '5173'),
+    strictPort: true, // Fail if port is busy
     proxy: {
       '/api': {
-        target: 'http://localhost:3002',
+        target: `http://localhost:${process.env.PORT || 3002}`,
         changeOrigin: true,
         secure: false,
         configure: (proxy, _options) => {

package/tmp/guangxi.jpg DELETED Viewed

Binary file

package//345/217/202/350/200/203/345/233/276/347/211/207//346/210/252/345/261/2172026-02-18 16.47.45_/345/233/276/347/211/207/345/260/272/345/257/270/350/260/203/350/212/202_/351/242/204/350/256/276/345/260/272/345/257/270.jpg DELETED Viewed

Binary file

package//345/217/202/350/200/203/345/233/276/347/211/207//346/210/252/345/261/2172026-02-18 16.47.51_/345/233/276/347/211/207/345/260/272/345/257/270/350/260/203/350/212/202_/346/211/213/345/267/245/350/276/223/345/205/245/345/260/272/345/257/270.jpg DELETED Viewed

Binary file

package//345/217/202/350/200/203/345/233/276/347/211/207//346/210/252/345/261/2172026-02-18 16.54.56_/345/233/276/347/211/207/345/260/272/345/257/270/350/260/203/350/212/202_/346/267/273/345/212/240/345/270/270/347/224/250/345/260/272/345/257/270.jpg DELETED Viewed

Binary file

package//345/217/202/350/200/203/345/233/276/347/211/207//346/210/252/345/261/2172026-02-18 16.55.11_/345/233/276/347/211/207/345/260/272/345/257/270/350/260/203/350/212/202_/345/210/240/351/231/244/345/270/270/347/224/250/345/260/272/345/257/270.jpg DELETED Viewed

Binary file