fix(big fix upgrade): upgrade multiple areas of the core functionalities

ts/manager.image/classes.imagemanager.ts

@@ -1,5 +1,6 @@
 import type { Cloudly } from '../classes.cloudly.js';
 import * as plugins from '../plugins.js';
+import * as paths from '../paths.js';
 
 import { Image } from './classes.image.js';
 
@@ -9,14 +10,13 @@ export class ImageManager {
   public smartbucketInstance: plugins.smartbucket.SmartBucket;
   public imageDir: plugins.smartbucket.Directory;
   public dockerImageStore: plugins.docker.DockerImageStore;
-  
+
   get db() {
     return this.cloudlyRef.mongodbConnector.smartdataDb;
   }
 
   public CImage = plugins.smartdata.setDefaultManagerForDoc(this, Image);
 
-
   constructor(cloudlyRefArg: Cloudly) {
     this.cloudlyRef = cloudlyRefArg;
 
@@ -37,7 +37,19 @@ export class ImageManager {
           };
         }
       )
-    )
+    );
+
+    this.typedrouter.addTypedHandler<plugins.servezoneInterfaces.requests.image.IRequest_GetImage>(
+      new plugins.typedrequest.TypedHandler('getImage', async (reqArg, toolsArg) => {
+        await toolsArg.passGuards([this.cloudlyRef.authManager.adminIdentityGuard], reqArg);
+        const image = await this.CImage.getInstance({
+          id: reqArg.imageId,
+        });
+        return {
+          image: await image.createSavableObject(),
+        };
+      })
+    );
 
     this.typedrouter.addTypedHandler(
       new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.image.IRequest_DeleteImage>(
@@ -74,14 +86,33 @@ export class ImageManager {
       new plugins.typedrequest.TypedHandler<plugins.servezoneInterfaces.requests.image.IRequest_PushImageVersion>(
         'pushImageVersion',
         async (reqArg, toolsArg) => {
-          const image = await this.CImage.getInstance({
+          await plugins.smartguard.passGuardsOrReject(reqArg, [
+            this.cloudlyRef.authManager.validIdentityGuard,
+          ]);
+          const refImage = await this.CImage.getInstance({
             id: reqArg.imageId,
           });
-          if (!image) {
+          if (!refImage) {
             throw new plugins.typedrequest.TypedResponseError('Image not found');
           }
           const imageVersion = reqArg.versionString;
+          console.log(
+            `got request to push image version ${imageVersion} for image ${refImage.data.name}`
+          );
           const imagePushStream = reqArg.imageStream;
+          (async () => {
+            const smartWebDuplex = new plugins.smartstream.webstream.WebDuplexStream<
+              Uint8Array,
+              Uint8Array
+            >({
+              writeFunction: async (chunkArg, toolsArg) => {
+                console.log(chunkArg);
+                return chunkArg;
+              },
+            });
+            imagePushStream.writeToWebstream(smartWebDuplex.writable);
+            await this.dockerImageStore.storeImage(refImage.id, plugins.smartstream.SmartDuplex.fromWebReadableStream(smartWebDuplex.readable));
+          })();
           return {
             allowed: true,
           };
@@ -94,12 +125,17 @@ export class ImageManager {
         'pullImageVersion',
         async (reqArg) => {
           const image = await this.CImage.getInstance({
-              id: reqArg.imageId,
+            id: reqArg.imageId,
           });
-          const imageVersion = image.data.versions.find((version) => version.versionString === reqArg.versionString);
-          const readable = this.imageDir.fastGetStream({
-            path: await image.getStoragePath(reqArg.versionString),
-          }, 'webstream');
+          const imageVersion = image.data.versions.find(
+            (version) => version.versionString === reqArg.versionString
+          );
+          const readable = this.imageDir.fastGetStream(
+            {
+              path: await image.getStoragePath(reqArg.versionString),
+            },
+            'webstream'
+          );
           const imageVirtualStream = new plugins.typedrequest.VirtualStream();
           return {
             imageStream: imageVirtualStream,
@@ -110,6 +146,7 @@ export class ImageManager {
   }
 
   public async start() {
+    // lets setup s3
     const s3Descriptor: plugins.tsclass.storage.IS3Descriptor =
       await this.cloudlyRef.config.appData.waitForAndGetKey('s3Descriptor');
     console.log(this.cloudlyRef.config.data.s3Descriptor);
@@ -117,10 +154,17 @@ export class ImageManager {
       this.cloudlyRef.config.data.s3Descriptor
     );
     const bucket = await this.smartbucketInstance.getBucketByName('cloudly-test');
-    await bucket.fastPut({ path: 'test/test.txt', contents: 'hello' });
+    await bucket.fastPut({ path: 'images/00init', contents: 'init' });
 
     this.imageDir = await bucket.getDirectoryFromPath({
-      path: 'images',
+      path: '/images',
+    });
+
+    // lets setup dockerstore
+    await plugins.smartfile.fs.ensureDir(paths.dockerImageStoreDir);
+    this.dockerImageStore = new plugins.docker.DockerImageStore({
+      localDirPath: paths.dockerImageStoreDir,
+      bucketDir: this.imageDir,
     });
   }
 }