using reverse nginx proxy

.mercs.yaml

@@ -1,6 +1,6 @@
 server:
   network:
-    public_url: http://127.0.0.1:1688
+    public_url: http://0.0.0.0.1688
     rateLimit:
       global: false
       max: 1000
@@ -111,7 +111,7 @@ server:
     cdn:
       type: local
       useLocalRoute: true #whether to use the local route or seaweed returned public url for serving images
-      localRoute: 'http://127.0.0.1:1688/fid'
+      localRoute: 'http://0.0.0.0.1688/fid'
       kvStorage:
         dbPath: './data.local/db'
 
@@ -119,11 +119,11 @@ server:
         default_ttl: 7d #default ttl for  temp artifacts
       # ${{ if navigator.platform.startsWith("Win") }}:
       #   root: 'c://temp//cdn'
-      #   url: '127.0.0.1:1688'
+      #   url: '0.0.0.0.1688'
       #   insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
       # ${{ else }}:
         root: './data.local/files'
-        url: '127.0.0.1:1688'
+        url: '0.0.0.0.1688'
         insecure: true #whether to use https (e.g. behind reverse proxy) when talking to volume nodes on the backend
 
       routes:

Dockerfile

@@ -1,21 +1,33 @@
-FROM node:20.6.1
-USER node
-WORKDIR /home/node/app
+FROM nikolaik/python-nodejs:python3.10-nodejs20 
 
+USER root
+RUN apt-get -y update && apt-get -y install nginx
+RUN mkdir -p /var/cache/nginx \
+             /var/log/nginx \
+             /var/lib/nginx
+RUN touch /var/run/nginx.pid
+RUN chown -R pn:pn /var/cache/nginx \
+                       /var/log/nginx \
+                       /var/lib/nginx \
+                       /var/run/nginx.pid
+
+                       
 RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o _tempfile.bin
-RUN mkdir -p /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-RUN chmod 777 /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
-RUN mv _tempfile.bin /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R node /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-RUN chmod 777 /home/node/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+RUN mkdir -p /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
+RUN mv _tempfile.bin /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R root /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+RUN chmod 777 /app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 
-COPY --chown=node . /home/node/app
+# FROM node:20.6.1
+WORKDIR /app
+COPY --chown=root . /app
 
 RUN yarn install
 
-EXPOSE 1688
+EXPOSE 4444
 
-CMD [ "./omnitool_start.sh" ]
+CMD ["bash", "run.sh"]
 
 
 # ## docker build -t manusapiens/omnitool-test2b .
-# ## docker run --name n10c -p 7860:7860 -d manusapiens/omnitool-test2b
+# ## docker run --name n13 -p 1688:1688 -d manusapiens/omnitool-test2b

README.md

@@ -1,10 +1,10 @@
 ---
-title: O T 3
+title: O T 3 - nginx edition
 emoji: 🐳
 colorFrom: yellow
 colorTo: gray
 sdk: docker
-app_port: 1688
+app_port: 4444
 ---
 # Omnitool.ai - Your Open Source AI Desktop
 
@@ -182,14 +182,14 @@ You can then access the Omnitool software from a web browser on your local machi
 
   ```
 ◐ Booting Server
-✔ Server has started and is ready to accept connections on http://127.0.0.1:1688.
+✔ Server has started and is ready to accept connections on http://0.0.0.0.1688.
 ✔ Ctrl-C to quit.
 ```
 
 5. **Open Omnitool in a Web Browser**
 
   Omnitool.ai can now be accessed from:
-  [127.0.0.1:1688](http://127.0.0.1:1688)  
+  [0.0.0.0.1688](http://0.0.0.0.1688)  
 
 ---
 6. **Explore the Sample Recipes**
@@ -266,7 +266,7 @@ Once you have your JWT, you can execute a recipe by making a POST request to the
 **Endpoint**
 
 ```
-POST http://127.0.0.1:1688/api/v1/workflow/exec
+POST http://0.0.0.0.1688/api/v1/workflow/exec
 ```
 
 **Header**
@@ -282,7 +282,7 @@ Authorization: Bearer <token>
 To make the request using curl, you would use the following command, replacing <token> with your actual JWT:
 
 ```
-curl -X POST http://127.0.0.1:1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
+curl -X POST http://0.0.0.0.1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
 ```
 
 **Response**

myNodeServer.js

@@ -0,0 +1,134 @@
+const fastify = require('fastify')({ logger: true });
+const { spawn } = require('child_process');
+
+let OMNITOOL_READY = false;
+let ALREADY_STARTING = false;
+let MANAGEMENT_SERVER_PORT = 7860;
+let SERVER_HOST = '0.0.0.0';
+console.log(`************ Management Server ************`);
+let omnitoolLogs = [];
+
+async function startOmnitoolServer() {
+    if (ALREADY_STARTING) return;
+    ALREADY_STARTING = true;
+
+    console.log('Starting Omnitool Server...');
+    return new Promise((resolve, reject) => {
+        const omnitoolStartProcess = spawn('./omnitool_start.sh');
+
+        omnitoolStartProcess.stdout.on('data', (data) => {
+            omnitoolLogs.push(data.toString());
+            console.log(`omnitool stdout: ${data}`);
+            if (data.toString().includes(`Server has started and is ready to accept connections`)) {
+                OMNITOOL_READY = true;
+                console.log('Omnitool server started successfully');
+                resolve();
+            }
+        });
+
+        omnitoolStartProcess.stderr.on('data', (data) => {
+            console.error(`omnitool stderr: ${data}`);
+        });
+
+        omnitoolStartProcess.on('close', (code) => {
+            console.log(`Omnitool server process exited with code ${code}`);
+            if (!OMNITOOL_READY) {
+                ALREADY_STARTING = false;
+                reject(`Omnitool server did not start within the timeout period.`);
+            }
+        });
+    });
+}
+
+fastify.get('/', async (request, reply) => {
+    const localUrl = request.headers['host'];
+
+    if (!OMNITOOL_READY) {
+        let htmlContent = `
+            <html>
+                <head><title>Proxy Server</title></head>
+                <body>
+                    <button id="startServerButton" onclick="startServer()">Start Omnitool Server</button>
+                    <button onclick="window.location.href='http://${localUrl}'">${localUrl}</button>
+                    <div id="logs" style="white-space: pre-wrap;"></div>
+                    <script>
+                        function startServer() {
+                            document.getElementById('startServerButton').disabled = true;
+                            fetch('/start-omnitool-server')
+                                .then(response => response.json())
+                                .then(data => {
+                                    startLogPolling();
+                                });
+                        }
+
+                        function startLogPolling() {
+                            const interval = setInterval(() => {
+                                fetch('/omnitool-logs')
+                                    .then(response => response.json())
+                                    .then(data => {
+                                        document.getElementById('logs').innerText = data.logs.join("\\n");
+                                        if (data.ready) {
+                                            clearInterval(interval);
+                                            window.location.reload(); // Refresh the page when Omnitool is ready
+                                        }
+                                    });
+                            }, 1000);
+                        }
+                        
+                        startLogPolling();
+                    </script>
+                </body>
+            </html>
+        `;
+        reply.type('text/html').send(htmlContent);
+    } else {
+        let htmlContent = `
+        <html>
+            <head><title>Proxy Server</title></head>
+            <body>
+                <button onclick="redirect()">Goto: ${localUrl}</button>
+                <script>
+                    function redirect() {
+                        window.location.replace('http://${localUrl}/omnitool');
+                    }
+                </script>                
+                <div id="logs" style="white-space: pre-wrap;"></div>
+            </body>
+        </html>
+    `;
+    reply.type('text/html').send(htmlContent);
+    }
+});
+
+fastify.get('/omnitool-logs', async (request, reply) => {
+    reply.send({ logs: omnitoolLogs, ready: OMNITOOL_READY });
+});
+
+fastify.get('/start-omnitool-server', async (request, reply) => {
+    if (!OMNITOOL_READY) {
+        if (ALREADY_STARTING) {
+            return { message: "Omnitool server already starting" };
+        }
+        try {
+            await startOmnitoolServer();
+            reply.send({ message: "Omnitool server started successfully" });
+        } catch (error) {
+            console.error(error);
+            reply.send({ message: `Error starting Omnitool server: ${error}` });
+        }
+    } else {
+        reply.send({ message: "Omnitool server already running" });
+    }
+});
+
+const start = async () => {
+    try {
+        await fastify.listen({ port: MANAGEMENT_SERVER_PORT, host: SERVER_HOST });
+        console.log(`Server is listening on port ${MANAGEMENT_SERVER_PORT}`);
+    } catch (err) {
+        console.error(`Error starting server: ${err}`);
+        process.exit(1);
+    }
+};
+
+start();

nginx.conf

@@ -0,0 +1,36 @@
+server {
+    listen 4444 default_server;
+    listen [::]:4444 default_server;
+
+    server_name _;
+
+    location / {
+        # Serve myNodeServer 7860
+        proxy_pass http://localhost:7860;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_cache_bypass $http_upgrade;
+        proxy_read_timeout 86400;
+        proxy_redirect off;
+    }
+
+    location /omnitool/ {
+        # Serve omnitool on 1688
+        rewrite ^/omnitool/(.*) /$1 break;
+        proxy_pass http://localhost:1688;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_cache_bypass $http_upgrade;
+        proxy_read_timeout 86400;
+        proxy_redirect off;
+    }
+
+}

packages/omni-server/src/run.ts

@@ -229,7 +229,7 @@ const boot = async (options: OptionValues) => {
   //       needs to be reworked. But for now this allows us to run code on both client and server.
   const apiConfig: IAPIServerServiceConfig = {
     id: 'api',
-    host: 'http://127.0.0.1:1688', // remote API is disabled?
+    host: 'http://0.0.0.0.1688', // remote API is disabled?
     integrationsUrl: '/api/v1/mercenaries/integrations'
   };
   server.use(APIServerService, apiConfig);

run.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Start Nginx
+service nginx start
+
+# Start the Node.js server in the background
+node myNodeServer.js --port 7860 --host 0.0.0.0 & echo $! > node_server.pid
+
+# Start the main application with yarn in the background
+# yarn
+# yarn start -u -rb -R blocks & echo $! > yarn_service.pid
+
+# The script waits here for the yarn start process to terminate
+wait $(cat node_server.pid)
+
+# Cleanup: terminate and clean up background services
+pkill -F node_server.pid
+rm node_server.pid