back to basics

Dockerfile

@@ -1,49 +1,32 @@
-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 root:root /var/cache/nginx \
-                       /var/log/nginx \
-                       /var/lib/nginx \
-                       /var/run/nginx.pid
-
-
-ENV HOME=/home/root \
-    PATH=/home/root/.local/bin:$PATH
+FROM node:20.6.1
+
+USER node
+
+ENV HOME=/home/node 
+#    PATH=/home/node/.local/bin:$PATH
+
 WORKDIR $HOME/app
 
 RUN mkdir -p $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
 RUN chmod 777 $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/
 RUN curl -L https://github.com/omnitool-ai/omnitool/raw/main/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 -o $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 RUN chmod 777 $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-#RUN mv _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R root $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
+#RUN mv _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1 && chown -R node $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 RUN mkdir $HOME/app/node_modules
 RUN chmod 777 $HOME/app/node_modules
 
-# Install dependencies and build app as non-root
-#USER root
-
-#COPY --chown=root _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
-
+# Install dependencies and build app as non-node
+#USER node
+#COPY --chown=node _tempfile.bin $HOME/app/packages/omni-server/config.default/models/nsfwjs/mobilenet-v2-quant/group1-shard1of1
 # FROM node:20.6.1
 
-COPY --chown=root . $HOME/app
+COPY --chown=node . $HOME/app
 
 RUN yarn install
 
 EXPOSE 4444
 EXPOSE 1688
-EXPOSE 1689
-
-# Copy nginx configuration
-COPY --chown=root nginx.conf /etc/nginx/sites-available/default
 
 CMD ["bash", "run.sh"]
-
-
 # ## docker build -t manusapiens/omnitool-test2b .
 # ## docker run --name n13 -p 1688:1688 -d manusapiens/omnitool-test2b

README.md

@@ -1,5 +1,5 @@
 ---
-title: O T 3 - nginx edition 4444
+title: O T 4 - back to basics
 emoji: 🐳
 colorFrom: yellow
 colorTo: gray
@@ -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://0.0.0.0.1688.
+✔ Server has started and is ready to accept connections on http://127.0.0.1:1688.
 ✔ Ctrl-C to quit.
 ```
 
 5. **Open Omnitool in a Web Browser**
 
   Omnitool.ai can now be accessed from:
-  [0.0.0.0.1688](http://0.0.0.0.1688)  
+  [127.0.0.1:1688](http://127.0.0.1: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://0.0.0.0.1688/api/v1/workflow/exec
+POST http://127.0.0.1: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://0.0.0.0.1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
+curl -X POST http://127.0.0.1:1688/api/v1/workflow/exec -H "Authorization: Bearer <token>"
 ```
 
 **Response**

myNodeServer.js

@@ -1,33 +1,128 @@
 const fastify = require('fastify')({ logger: true });
-let MANAGEMENT_SERVER_PORT = 1689;
-let SERVER_HOST = '0.0.0.0';
-console.log(`************ Management Server v 0.002 ************`);
+const { spawn } = require('child_process');
+const { createProxyMiddleware } = require('http-proxy-middleware');
+
+let OMNITOOL_READY = false;
+let ALREADY_STARTING = false;
+
+const PROXY_PORT = 4444;
+const TARGET_HOST = '0.0.0.0';
+const PROXY_TARGET = 'http://0.0.0.0:1688';
+const VERSION = '0.0.2c';
+
+console.log(`************ Omnitool Proxy Server v${VERSION} ************`);
+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 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);
+            <html>
+                <head><title>Proxy Server</title></head>
+                <body>
+                    <button id="startServerButton" onclick="startServer()">Start Omnitool Server</button>
+                    <button id="exitIframeButton" onclick="window.open('http://${localUrl}', '_blank')" disabled>Exit Iframe</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 {
+        console.log('Proxying request as OMNITOOL is ready');
+        const proxy = createProxyMiddleware({
+            target: PROXY_TARGET,
+            changeOrigin: true,
+            ws: true,
+            logLevel: 'debug'
+        });
+        proxy(request.raw, reply.raw, () => {});
+    }
+});
+
+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}`);
+        await fastify.listen({ port: PROXY_PORT, host: TARGET_HOST });
+        console.log(`Server is listening on http://${TARGET_HOST}:${PROXY_PORT}`);
     } catch (err) {
         console.error(`Error starting server: ${err}`);
         process.exit(1);

nginx.conf

@@ -1,36 +0,0 @@
-server {
-    listen 4444 default_server;
-    listen [::]:4444 default_server;
-
-    server_name _;
-
-    location / {
-        # Serve myNodeServer 1689
-        proxy_pass http://localhost:1689;
-        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

@@ -250,7 +250,7 @@ const boot = async (options: OptionValues) => {
   const chatServiceConfig: IServiceConfig = Object.assign({ id: 'chat' });
   server.use(ChatService, chatServiceConfig);
 
-  const listenOn = new URL('http://0.0.0.0:1688');
+  const listenOn = new URL('http://127.0.0.1:1688');
   listenOn.hostname = options.listen;
   listenOn.protocol = options.secure ? 'https' : 'http';
   listenOn.port = options.port;

packages/omni-server/src/services/FastifyServerService.ts

@@ -75,7 +75,7 @@ class FastifyServerService extends Service {
 
   constructor(id: string, manager: ServiceManager, config: FastifyServerServiceConfig) {
     config.opts ??= {};
-    config.listen ??= { host: '0.0.0.0', port: 3000 };
+    config.listen ??= { host: '127.0.0.1', port: 3000 };
     config.cors ??= { origin: true, credentials: false };
     config.session ??= {
       secret: 'secret that is more than 32 characters',

run.sh

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