feat: add service log

Signed-off-by: MiaoWoo <admin@yumc.pw>

packages/core/public/event/js/index.js

@@ -1,81 +0,0 @@
-let command = '';
-Terminal.applyAddon(fit);
-Terminal.applyAddon(attach);
-Terminal.applyAddon(fullscreen);
-var term = new Terminal({
-    experimentalCharAtlas: 'dynamic',
-    cursorBlink: false,
-});
-term.open(document.getElementById('terminal'));
-term.toggleFullScreen();
-term.fit();
-
-window.onresize = function() {
-    term.fit();
-}
-
-let query = {}
-location.search.substring(1).split("&").forEach(q => {
-    let qy = q.split("=", 2);
-    query[qy[0]] = qy[1]
-})
-
-console.log(query);
-
-var system = io('/', {
-    path: '/ws',
-    transports: ['websocket']
-});
-
-system.on('connect', () => {
-    system.emit('events', {})
-})
-
-system.on('message', data => {
-    term.write(data.toString() + '\r\n');
-});
-
-var container = io('/container', {
-    path: '/ws',
-    transports: ['websocket']
-});
-container.on('connect', () => {
-    term.writeln('connect')
-    if (query.action) {
-        term.writeln(`Recover Action: ${query.action} Data: ${query.data}`)
-        switch (query.action) {
-            case "container":
-                container.emit('logs', {
-                    id: query.data,
-                    // since: Date.now() / 1000 - 60 * 15,
-                    // until: Date.now() / 1000,
-                    // stderr: false,
-                    tail: "200"
-                })
-                break;
-            default:
-        }
-    }
-});
-term.on('data', async data => {
-    if (data == '\t') {
-        return;
-    }
-    term.write(data);
-    if (data == '\r') {
-        term.write('\n');
-        container.emit('logs', {
-            id: command
-        })
-        command = '';
-    } else {
-        command += data;
-    }
-});
-container.on('message', data => {
-    term.write(data.toString() + '\r\n');
-});
-container.on('disconnect', () => {
-    term.reset();
-    term.writeln('disconnect');
-});

packages/core/public/logs/js/index.js

@@ -0,0 +1,82 @@
+let command = '';
+Terminal.applyAddon(fit);
+Terminal.applyAddon(attach);
+Terminal.applyAddon(fullscreen);
+var term = new Terminal({
+    experimentalCharAtlas: 'dynamic',
+    cursorBlink: false,
+});
+term.open(document.getElementById('terminal'));
+term.toggleFullScreen();
+term.fit();
+
+window.onresize = function() {
+    term.fit();
+}
+
+let query = {}
+location.search.substring(1).split("&").forEach(q => {
+    let qy = q.split("=", 2);
+    query[qy[0]] = qy[1]
+})
+
+function connectServer(namespace, id) {
+    var server = io(namespace, {
+        path: '/ws',
+        transports: ['websocket']
+    });
+    server.on('connect', () => {
+        term.writeln('connect')
+        server.emit('logs', {
+            id: id,
+            tail: "200"
+        })
+    });
+    server.on('message', data => {
+        term.write(data.toString() + '\r\n');
+    });
+    server.on('disconnect', () => {
+        term.reset();
+        term.writeln('disconnect');
+    });
+}
+
+console.log(query);
+
+term.writeln(`Recover Action: ${query.action} Data: ${query.data}`)
+
+switch (query.action) {
+    case "container":
+    case "service":
+        connectServer(`/${query.action}`, query.data)
+        break;
+    default:
+        var system = io('/', {
+            path: '/ws',
+            transports: ['websocket']
+        });
+
+        system.on('connect', () => {
+            system.emit('events', {})
+        })
+
+        system.on('message', data => {
+            term.write(data.toString() + '\r\n');
+        });
+}
+
+term.on('data', async data => {
+    if (data == '\t') {
+        return;
+    }
+    term.write(data);
+    if (data == '\r') {
+        term.write('\n');
+        container.emit('logs', {
+            id: command
+        })
+        command = '';
+    } else {
+        command += data;
+    }
+});

packages/core/resources/docker.http

@@ -1 +0,0 @@
-POST https://dayu-api.miaowoo.cc/service/swirl_swirl/restart

packages/core/src/controller/docker/service.ts

@@ -1,21 +1,22 @@
-import { controller, post, get, requestParam, queryParam } from '@cc-server/binding';
 import * as docker from '@dayu/docker-api'
+import { namespace, listener, interfaces, io, Message } from '@cc-server/ws'
+import { controller, post, get, requestParam, queryParam } from '@cc-server/binding';
 
 @controller('/service')
 class ServiceController {
     @get('/list')
     public async list(@queryParam('page') page: number, @queryParam('perPage') perPage: number, ) {
         let services = await docker.service.list();
+        let rows = services.map(s => ({
+            "service-name": s.Spec.Name,
+            image: s.Spec.TaskTemplate.ContainerSpec.Image.split('@')[0],
+            updated_at: s.UpdatedAt,
+            mode: s.Spec.Mode,
+            update_status: s.UpdateStatus
+        }))
         return {
             status: 0,
-            msg: '',
-            data: services.map(s => ({
-                "service-name": s.Spec.Name,
-                image: s.Spec.TaskTemplate.ContainerSpec.Image.split('@')[0],
-                updated_at: s.UpdatedAt,
-                mode: s.Spec.Mode,
-                update_status: s.UpdateStatus
-            }))
+            data: { rows }
         };
     }
 
@@ -73,3 +74,20 @@ class ServiceController {
         }
     }
 }
+
+@namespace("/service")
+class ServiceNamespace extends interfaces.Namespace {
+    @listener()
+    async logs(socket: io.Socket, data: any) {
+        try {
+            let stream = await docker.service.logs(data.id, data);
+            this.defer(socket, () => stream.connection.destroy());
+            stream.on('data', (chunk: ArrayBuffer) => {
+                let log = Buffer.from(chunk.slice(8, chunk.byteLength - 1)).toString();
+                socket.send(log);
+            })
+        } catch (ex) {
+            return new Message(ex.message);
+        }
+    }
+}