Merge pull request #9 from ZorTik/dev

Dev

Author: ZorTik

.github/workflows/jest.yml

@@ -37,4 +37,7 @@ jobs:
       - name: Prisma migrate
         run: npx prisma migrate deploy
       - name: Run tests
-        run: npm test
+        run: npm test
+      - name: Publish Test Summary Results
+        run: npx github-actions-ctrf ctrf/ctrf-report.json
+        if: always()

TODO.txt

@@ -119,7 +119,7 @@ export default async function (router: Application, options?: AppBootOptions): P
         appConfig,
         logger,
         debug: process.env.DEBUG === 'true',
-        workers: !options.disableWorkers && !isInsideContainer()
+        workers: !options?.disableWorkers && !isInsideContainer()
     };
 
     // Service (virtualization) layer

app.ts

@@ -15,27 +15,30 @@ export type Database = {
     count(nodeId: string): Promise<number>;
     setServiceMeta(serviceId: string, key: string, value: any): Promise<boolean>;
     getServiceMeta(serviceId: string, key: string): Promise<any>;
-}
+};
 
 export type SessionModel = {
     serviceId: string,
     nodeId: string,
     containerId: string,
-}
+};
 
 export type PermaModel = {
     serviceId: string,
     template: string,
     nodeId: string,
     port: number,
     options: {
-        [key: string]: any
+        [key: string]: any,
     },
+    meta?: {
+        stopCmd?: string,
+    }
     env: {
-        [key: string]: string
+        [key: string]: string,
     },
     network?: {
         address: string,
         portsOnly: boolean,
     }
-}
+};

database/models.ts

@@ -1,8 +1,9 @@
-export type UnlockObserver = (id: string, status?: string) => void;
+export type UnlockObserver = (id: string, status?: string, err?: any) => void;
 
 const statuses = {};
 const status_types = {};
 const obs: Map<string, UnlockObserver[]> = new Map();
+const obsAll: (() => void)[] = [];
 
 let stopping = false;
 
@@ -17,11 +18,17 @@ export function lockBusyAction(id: string, tp: string) {
     reqNotPending(id);
     statuses[id] = true;
     status_types[id] = tp; // type of action
-    return () => {
+    return (err?: any) => {
         delete statuses[id];
         delete status_types[id];
         //
-        (obs.get(id) ?? []).forEach(o => o(id, tp));
+        (obs.get(id) ?? []).forEach(o => o(id, tp, err));
+        obs.delete(id);
+        //
+        if (pendingCount() == 0) {
+            obsAll.forEach(o => o());
+            obsAll.splice(0, obsAll.length);
+        }
     }
 }
 
@@ -30,7 +37,15 @@ export function whenUnlocked(id: string, cb: UnlockObserver) {
         obs.set(id, obs.get(id) ?? []);
         obs.get(id).push(cb);
     } else {
-        cb(id, undefined);
+        cb(id, undefined, undefined);
+    }
+}
+
+export function whenUnlockedAll(cb: () => void) {
+    if (pendingCount() > 0) {
+        obsAll.push(cb);
+    } else {
+        cb();
     }
 }
 
@@ -58,4 +73,10 @@ export function reqNotPending(id: string) {
 
 export function setStopping() {
     stopping = true;
+}
+
+export function pendingCount() {
+    return Object.keys(statuses)
+        .filter(k => statuses[k])
+        .length;
 }

engine/asyncp.ts

@@ -226,7 +226,7 @@ export default function (self: ServiceEngine, client: DockerClient): ServiceEngi
                     srvLog.info('Watching changes');
                     // Watcher
                     setTimeout(async () => {
-                        const attachOptions = { stream: true, stdout: true, hijack: true };
+                        const attachOptions = { stream: true, stdin: true, stdout: true, stderr: true, hijack: true };
                         const rws = await client.getContainer(container.id).attach(attachOptions);
                         rws.on('data', (data) => {
                             logService(volumeId, data);

engine/docker/action/build.ts

@@ -8,10 +8,6 @@ const tag = workerData['imageTag'] as string;
 const env = workerData['env'] as any;
 const debug = workerData['debug'] as boolean;
 
-if (debug) {
-    console.log("Initializing docker client inside worker.");
-}
-
 const client = initDockerClient(appConfig);
 const logs = [];
 

engine/docker/action/build.worker.ts

@@ -6,7 +6,7 @@ export default function (self: ServiceEngine, _: DockerClient): ServiceEngine['c
         const watchers = (self as DockerServiceEngine).rws;
         //
         if (id in watchers) {
-            watchers[id].write(cmd);
+            watchers[id].write(cmd + '\n');
             return true;
         } else {
             return false;