Merge pull request #2 from Dynamsoft/release/v1.0.x/v1.0.2

feat: release v1.0.2

Author: Tom-Dynamsoft

.github/workflows/main.yml

@@ -1,5 +1,3 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
 # Controls when the workflow will run
@@ -20,7 +18,6 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-         # Runs a set of commands using the runners shell
       - name: Get Source
         run: |
           cd /home/ubuntu
@@ -30,22 +27,21 @@ jobs:
       - name: Prepare Files
         run: |
           # Create a temporary directory for the files to be uploaded
-          mkdir -p /home/ubuntu/document-scanner-javascript/demo
+          mkdir -p /home/ubuntu/document-scanner-javascript/deploy
           
           # Copy the dist folder
-          cp -r /home/ubuntu/document-scanner-javascript/dist /home/ubuntu/document-scanner-javascript/demo
+          cp -r /home/ubuntu/document-scanner-javascript/dist /home/ubuntu/document-scanner-javascript/deploy
           
-          # Copy the samples folder and rename demo.html to index.html
-          cp -r /home/ubuntu/document-scanner-javascript/samples/* /home/ubuntu/document-scanner-javascript/demo
-          mv /home/ubuntu/document-scanner-javascript/demo/demo.html /home/ubuntu/document-scanner-javascript/demo/index.html
+          # Copy demo and hello world. On demo branch, be sure to update the pathing for the demo
+          cp -r /home/ubuntu/document-scanner-javascript/samples/demo/* /home/ubuntu/document-scanner-javascript/deploy
+          cp -r /home/ubuntu/document-scanner-javascript/samples/hello-world.html /home/ubuntu/document-scanner-javascript/deploy
 
-          
       - name: Sync files
         uses: SamKirkland/[email protected]
         with:
           server: ${{ secrets.FTP_DEMO_SERVER }}
           username: ${{ secrets.FTP_DEMO_USERNAME }}
           password: ${{ secrets.FTP_DEMO_PASSWORD }}
           port: 21 
-          local-dir: /home/ubuntu/document-scanner-javascript/demo/
-          server-dir: /Demo.dynamsoft.com/document-scanner/
+          local-dir: /home/ubuntu/document-scanner-javascript/deploy/
+          server-dir: /Demo.dynamsoft.com/document-scanner/

README.md

@@ -1,3 +1,4 @@
+import formidable from "formidable";
 import express from "express";
 import fs from "fs";
 import http from "http";
@@ -32,23 +33,69 @@ app.use(
 
 // Serve static files
 app.use("/dist", express.static(distPath));
-app.use("/assets", express.static(path.join(__dirname, "../samples/assets")));
-app.use("/css", express.static(path.join(__dirname, "../samples/css")));
-app.use("/font", express.static(path.join(__dirname, "../samples/font")));
+app.use("/assets", express.static(path.join(__dirname, "../samples/demo/assets")));
+app.use("/css", express.static(path.join(__dirname, "../samples/demo/css")));
+app.use("/font", express.static(path.join(__dirname, "../samples/demo/font")));
 
 // Routes
 app.get("/", (req, res) => {
-  res.sendFile(path.join(__dirname, "../samples/demo.html"));
+  res.sendFile(path.join(__dirname, "../samples/hello-world.html"));
 });
 
 app.get("/demo", (req, res) => {
-  res.sendFile(path.join(__dirname, "../samples/demo.html"));
+  res.sendFile(path.join(__dirname, "../samples/demo/index.html"));
 });
 
 app.get("/hello-world", (req, res) => {
   res.sendFile(path.join(__dirname, "../samples/hello-world.html"));
 });
 
+// Allow upload feature
+app.post("/upload", function (req, res) {
+  try {
+    // Create a new Formidable form
+    const form = formidable({
+      multiples: false,
+      keepExtensions: true,
+    });
+
+    form.parse(req, (err, fields, files) => {
+      if (err) {
+        console.error(err);
+        return res.status(500).send("Error processing the file upload.");
+      }
+
+      const uploadedFile = files.uploadFile[0]; // Ensure the file field name matches the form
+      if (!uploadedFile) {
+        return res.status(400).json({ success: false, message: "No file uploaded" });
+      }
+
+      // Get current timestamp
+      let dt = new Date();
+
+      const fileSavePath = path.join(__dirname, "\\");
+      const newFileName = uploadedFile.originalFilename;
+      const newFilePath = path.join(fileSavePath, newFileName);
+
+      // Move the uploaded file to the desired directory
+      fs.rename(uploadedFile.filepath, newFilePath, (err) => {
+        if (err) {
+          console.error(err);
+          return res.status(500).send("Error saving the file.");
+        }
+        console.log(`\x1b[33m ${newFileName} \x1b[0m uploaded successfully!`);
+      });
+      res.status(200).json({
+        success: true,
+        message: `${newFileName} uploaded successfully`,
+        filename: newFileName,
+      });
+    });
+  } catch (error) {
+    res.status(500).send("An error occurred during file upload.");
+  }
+});
+
 let httpPort = 3000;
 let httpsPort = 3001;
 
@@ -107,10 +154,11 @@ httpsServer.on("error", (error) => {
 
 // Start the servers
 httpServer.listen(httpPort, () => {
-  console.log("\n\x1b[1m Dynamsoft Document Scanner Sample\x1b[0m\n");
-  console.log("\x1b[36m Access URLs:\x1b[0m");
+  console.log("\n\x1b[1m Dynamsoft Document Scanner Samples\x1b[0m\n");
+  console.log("\x1b[36m HTTP URLs:\x1b[0m");
   console.log("\x1b[90m-------------------\x1b[0m");
-  console.log("\x1b[32m Local:\x1b[0m    http://localhost:" + httpPort + "/");
+  console.log("\x1b[33m Hello World:\x1b[0m    http://localhost:" + httpPort + "/hello-world");
+  console.log("\x1b[33m Demo:\x1b[0m    http://localhost:" + httpPort + "/demo");
 });
 
 httpsServer.listen(httpsPort, "0.0.0.0", () => {
@@ -124,13 +172,13 @@ httpsServer.listen(httpsPort, "0.0.0.0", () => {
     });
   });
 
+  console.log("\n");
+  console.log("\x1b[36m HTTPS URLs:\x1b[0m");
+  console.log("\x1b[90m-------------------\x1b[0m");
   ipv4Addresses.forEach((localIP) => {
-    console.log("\x1b[32m Network:\x1b[0m  https://" + localIP + ":" + httpsPort + "/");
+    console.log("\x1b[32m Hello World:\x1b[0m  https://" + localIP + ":" + httpsPort + "/hello-world");
+    console.log("\x1b[32m Demo:\x1b[0m  https://" + localIP + ":" + httpsPort + "/demo");
   });
-  console.log("\x1b[36m Available Pages:\x1b[0m");
-  console.log("\x1b[90m-------------------\x1b[0m");
-  console.log("\x1b[33m Demo:\x1b[0m        /demo");
-  console.log("\x1b[33m Hello World:\x1b[0m  /hello-world\n");
-
+  console.log("\n");
   console.log("\x1b[90mPress Ctrl+C to stop the server\x1b[0m\n");
 });

dev-server/index.js

@@ -1,6 +1,6 @@
 {
   "name": "dynamsoft-document-scanner",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Dynamsoft Document Scanner (DDS) is a ready-to-use SDK for capturing and enhancing document images with automatic border detection, correction, and customizable workflows.",
   "files": [
     "/dist",