chore: sync commits from swe-productivity study (#616)

Dockerfile

@@ -103,6 +103,7 @@ RUN ARCH=$(uname -m) && \
 COPY --from=install /temp/prod/node_modules node_modules
 COPY --from=prerelease /app/public/ /app/public/
 COPY --from=prerelease /app/dist /app/dist
+COPY entrypoint.sh /app/entrypoint.sh
 
 # COPY . .
 RUN mkdir data
@@ -111,4 +112,4 @@ EXPOSE 3000/tcp
 # used for calibre
 ENV QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox"
 ENV NODE_ENV=production
-ENTRYPOINT [ "bun", "run", "dist/src/index.js" ]
+ENTRYPOINT [ "/app/entrypoint.sh" ]

README.md

@@ -94,6 +94,7 @@ All are optional, JWT_SECRET is recommended to be set.
 | ACCOUNT_REGISTRATION         | false                                              | Allow users to register accounts                                                                                                                              |
 | HTTP_ALLOWED                 | false                                              | Allow HTTP connections, only set this to true locally                                                                                                         |
 | ALLOW_UNAUTHENTICATED        | false                                              | Allow unauthenticated users to use the service, only set this to true locally                                                                                 |
+| ALLOW_URL_UPLOAD             | false                                              | Allow uploading/converting files from URLs                                                                                                                    |
 | AUTO_DELETE_EVERY_N_HOURS    | 24                                                 | Checks every n hours for files older then n hours and deletes them, set to 0 to disable                                                                       |
 | WEBROOT                      |                                                    | The address to the root path setting this to "/convert" will serve the website on "example.com/convert/"                                                      |
 | BRANDING                     | ConvertX                                           | Custom string that allows you to change the display name of the website in the header (max 26 characters)                                                     |
@@ -103,6 +104,8 @@ All are optional, JWT_SECRET is recommended to be set.
 | LANGUAGE                     | en                                                 | Language to format date strings in, specified as a [BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag)                                     |
 | UNAUTHENTICATED_USER_SHARING | false                                              | Shares conversion history between all unauthenticated users                                                                                                   |
 | MAX_CONVERT_PROCESS          | 0                                                  | Maximum number of concurrent conversion processes allowed. Set to 0 for unlimited.                                                                            |
+| MAGICK_MAX_WIDTH             | unset (ImageMagick default)                        | (Docker only) ImageMagick maximum image width in pixels                                                                                                       |
+| MAGICK_MAX_HEIGHT            | unset (ImageMagick default)                        | (Docker only) ImageMagick maximum image height in pixels                                                                                                      |
 | PORT                         | 3000                                               | Application listen port                                                                                                                                       |
 
 ### Docker images

entrypoint.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+if [ -n "$MAGICK_MAX_WIDTH" ]; then
+  if ! [[ "$MAGICK_MAX_WIDTH" =~ ^[0-9]+$ ]]; then
+    echo "Error: MAGICK_MAX_WIDTH must be a positive integer in pixels" >&2
+    exit 1
+  fi
+fi
+
+if [ -n "$MAGICK_MAX_HEIGHT" ]; then
+  if ! [[ "$MAGICK_MAX_HEIGHT" =~ ^[0-9]+$ ]]; then
+    echo "Error: MAGICK_MAX_HEIGHT must be a positive integer in pixels" >&2
+    exit 1
+  fi
+fi
+
+if [ -n "$MAGICK_MAX_WIDTH" ] || [ -n "$MAGICK_MAX_HEIGHT" ]; then
+  POLICY_DIR="/etc/ImageMagick-7"
+  POLICY_FILE="$POLICY_DIR/policy.xml"
+
+  if [ -f "$POLICY_FILE" ] && grep -q "</policymap>" "$POLICY_FILE"; then
+    [ -n "$MAGICK_MAX_WIDTH" ] && sed -i '/<policy domain="resource" name="width"/d' "$POLICY_FILE"
+    [ -n "$MAGICK_MAX_HEIGHT" ] && sed -i '/<policy domain="resource" name="height"/d' "$POLICY_FILE"
+    if [ -n "$MAGICK_MAX_WIDTH" ]; then
+      sed -i "s|</policymap>|  <policy domain=\"resource\" name=\"width\" value=\"$MAGICK_MAX_WIDTH\"/>\n</policymap>|" "$POLICY_FILE"
+    fi
+    if [ -n "$MAGICK_MAX_HEIGHT" ]; then
+      sed -i "s|</policymap>|  <policy domain=\"resource\" name=\"height\" value=\"$MAGICK_MAX_HEIGHT\"/>\n</policymap>|" "$POLICY_FILE"
+    fi
+  else
+    mkdir -p "$POLICY_DIR"
+    echo "<policymap>" > "$POLICY_FILE"
+    if [ -n "$MAGICK_MAX_WIDTH" ]; then
+      echo "  <policy domain=\"resource\" name=\"width\" value=\"$MAGICK_MAX_WIDTH\"/>" >> "$POLICY_FILE"
+    fi
+    if [ -n "$MAGICK_MAX_HEIGHT" ]; then
+      echo "  <policy domain=\"resource\" name=\"height\" value=\"$MAGICK_MAX_HEIGHT\"/>" >> "$POLICY_FILE"
+    fi
+    echo "</policymap>" >> "$POLICY_FILE"
+  fi
+fi
+
+exec bun run dist/src/index.js

eslint.config.ts

@@ -51,6 +51,7 @@ export default defineConfig(
             "target",
             "convert_to_target",
             "job-details-toggle",
+            "share-btn",
           ],
         },
       ],

package.json

@@ -22,6 +22,7 @@
     "@elysiajs/static": "^1.4.10",
     "@kitajs/html": "^4.2.13",
     "elysia": "1.4.30",
+    "mime": "^4.1.0",
     "sanitize-filename": "^1.6.4",
     "tar": "^7.5.22"
   },

public/results.js

@@ -3,6 +3,56 @@ const jobId = window.location.pathname.split("/").pop();
 const main = document.querySelector("main");
 let progressElem = document.querySelector("progress");
 
+const supportsWebShare = navigator.share && navigator.canShare;
+
+const setupShareButtons = () => {
+  if (!supportsWebShare) {
+    return;
+  }
+
+  document.querySelectorAll(".share-btn").forEach((btn) => {
+    if (btn.dataset.setupComplete) return;
+
+    const filename = btn.dataset.filename;
+    const mimeType = btn.dataset.mimeType;
+    const fileUrl = btn.dataset.downloadUrl;
+    const dummyFile = new File([], filename, { type: mimeType });
+
+    if (!navigator.canShare({ files: [dummyFile] })) {
+      return;
+    }
+    let cachedFile = null;
+    let isFetching = false;
+
+    btn.addEventListener("click", async (e) => {
+      e.preventDefault();
+      if (isFetching) return;
+      try {
+        if (!cachedFile) {
+          isFetching = true;
+          const response = await fetch(fileUrl);
+          if (!response.ok) {
+            throw new Error(`Failed to download file (${response.status})`);
+          }
+          const blob = await response.blob();
+          cachedFile = new File([blob], filename, { type: mimeType });
+        }
+        await navigator.share({ files: [cachedFile] });
+      } catch (err) {
+        if (err.name === "NotAllowedError" && cachedFile) {
+          alert("File is ready. Please tap the share button again to share.");
+        } else if (err.name !== "AbortError") {
+          console.error("Error sharing:", err);
+        }
+      } finally {
+        isFetching = false;
+      }
+    });
+    btn.style.display = "";
+    btn.dataset.setupComplete = true;
+  });
+};
+
 const refreshData = () => {
   // console.log("Refreshing data...", progressElem.value, progressElem.max);
   if (progressElem.value !== progressElem.max) {
@@ -12,6 +62,7 @@ const refreshData = () => {
       .then((res) => res.text())
       .then((html) => {
         main.innerHTML = html;
+        setupShareButtons();
       })
       .catch((err) => console.log(err));
 
@@ -21,6 +72,7 @@ const refreshData = () => {
   progressElem = document.querySelector("progress");
 };
 
+setupShareButtons();
 refreshData();
 
 window.downloadAll = function () {