fix: change order when blocking master image sync process

PrivateAIM · Aug 7, 2024 · 8e9efc1 · 8e9efc1
1 parent bd43978
commit 8e9efc1
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 10 deletions.
diff --git a/packages/server-core/src/http/controllers/core/master-image/handlers/command.ts b/packages/server-core/src/http/controllers/core/master-image/handlers/command.ts
@@ -34,15 +34,17 @@ export async function commandMasterImageRouteHandler(req: Request, res: Response
                 throw new BadRequestError('A master images synchronization process is already in progress.');
             }
 
-            await runMasterImagesSynchronizeCommand()
-                .then(() => {
-                    // todo: maybe additional meta information
-                    memoryCache.set(MemoryCacheID.MASTER_IMAGES, {
-                        now: Date.now(),
-                    }, {
-                        ttl: 1000 * 60 * 15, // 15 minutes
-                    });
-                });
+            memoryCache.set(MemoryCacheID.MASTER_IMAGES, {
+                now: Date.now(),
+            }, {
+                ttl: 1000 * 60 * 15, // 15 minutes
+            });
+
+            try {
+                await runMasterImagesSynchronizeCommand();
+            } catch (e) {
+                memoryCache.del(MemoryCacheID.MASTER_IMAGES);
+            }
 
             return sendAccepted(res);
         }

diff --git a/packages/server-kit/package.json b/packages/server-kit/package.json
@@ -22,7 +22,9 @@
     "scripts": {
         "build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json",
         "build:js": "rollup -c",
-        "build": "rimraf ./dist && cross-env NODE_ENV=production npm run build:js && npm run build:types"
+        "build": "rimraf ./dist && cross-env NODE_ENV=production npm run build:js && npm run build:types",
+        "test": "cross-env NODE_ENV=test jest --config ./test/jest.config.js",
+        "test:coverage": "npm run test -- --coverage"
     },
     "dependencies": {
         "@ebec/http": "^2.3.0",

diff --git a/packages/server-kit/test/jest.config.js b/packages/server-kit/test/jest.config.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021-2024.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
+module.exports = {
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.tsx?$': 'ts-jest',
+    },
+    moduleFileExtensions: [
+        'ts',
+        'tsx',
+        'js',
+        'jsx',
+        'json',
+        'node',
+    ],
+    testRegex: '(/unit/.*|(\\.|/)(test|spec))\\.(ts|js)x?$',
+    testPathIgnorePatterns: [
+        'writable',
+        'dist',
+        '/unit/mock-util.ts',
+    ],
+    coverageDirectory: 'writable/coverage',
+    collectCoverageFrom: [
+        'src/**/*.{ts,tsx,js,jsx}',
+    ],
+    rootDir: '../',
+    verbose: true,
+};
diff --git a/packages/server-kit/test/unit/memory-cache.spec.ts b/packages/server-kit/test/unit/memory-cache.spec.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
+import { MemoryCache } from '../../src';
+
+describe('memory-cache', () => {
+    it('should support operations (set,get,has,del)', () => {
+        const cache = new MemoryCache();
+        cache.set('foo', { bar: 'baz' }, {
+            ttl: 1000 * 60 * 15,
+        });
+
+        expect(cache.has('foo')).toBeTruthy();
+
+        let value = cache.get('foo');
+        expect(value).toEqual({ bar: 'baz' });
+
+        cache.del('foo');
+
+        expect(cache.has('foo')).toBeFalsy();
+
+        value = cache.get('foo');
+        expect(value).toBeUndefined();
+    });
+});