@webda/gcp 4.0.0-beta.1 → 4.0.0-beta.3

package/lib/services/{storage.js → storage.service.js}

@@ -1,26 +1,29 @@
 import { Storage as GCS } from "@google-cloud/storage";
-import { BinaryParameters, CloudBinary, Throttler } from "@webda/core";
+import { CloudBinary, CloudBinaryParameters, useModelId } from "@webda/core";
+import { Throttler } from "@webda/utils";
 import { createReadStream } from "fs";
 import * as mime from "mime-types";
-import { Readable, Stream } from "stream";
-import { pipeline } from "stream/promises.js";
-export class StorageParameters extends BinaryParameters {
-    constructor(params, service) {
-        super(params, service);
-        this.prefix = "";
-    }
+import { Readable, Stream } from "node:stream";
+import { pipeline } from "node:stream/promises";
+/**
+ * Configuration for {@link Storage}
+ */
+export class StorageParameters extends CloudBinaryParameters {
 }
 /**
  * Google Storage Finder implementation
  */
 export class GCSFinder {
+    /**
+     * @param options - GCS client options
+     */
     constructor(options) {
         this._storage = new GCS(options);
     }
     /**
      * Get info from url
-     * @param path
-     * @returns
+     * @param path - the gs:// url
+     * @returns the bucket and key
      */
     getInfo(path) {
         const url = new URL(path);
@@ -39,26 +42,30 @@ export class GCSFinder {
     /**
      * Depth or options is ignored
      * @override
+     * @param path - the gs:// url to walk
+     * @param processor - called for each file found
+     * @param _options - ignored
+     * @param _depth - ignored
      */
-    async walk(path, processor, options, depth) {
+    async walk(path, processor, _options, _depth) {
         const { bucket, key } = this.getInfo(path);
         let pageToken;
         do {
-            let res = await this._storage.bucket(bucket).getFiles(pageToken ? pageToken : { prefix: key });
-            for (let file of res[0]) {
+            const res = await this._storage.bucket(bucket).getFiles(pageToken ? pageToken : { prefix: key });
+            for (const file of res[0]) {
                 processor(`${path}${file.name}`);
             }
             pageToken = res[1].pageToken;
         } while (pageToken);
     }
     /**
-     *
-     * @param currentPath
-     * @param options is ignored
-     * @returns
+     * Find files under a gs:// url
+     * @param currentPath - the gs:// url to search
+     * @param options - only `filterPattern` and `processor` are used
+     * @returns the files found
      */
     async find(currentPath, options) {
-        let res = [];
+        const res = [];
         await this.walk(currentPath, f => {
             if (options?.filterPattern && !options.filterPattern.test(f)) {
                 return;
@@ -72,8 +79,8 @@ export class GCSFinder {
     }
     /**
      * Get a write stream
-     * @param path
-     * @returns
+     * @param path - the gs:// url
+     * @returns the write stream
      */
     async getWriteStream(path) {
         const { bucket, key } = this.getInfo(path);
@@ -81,8 +88,8 @@ export class GCSFinder {
     }
     /**
      * Get a read stream
-     * @param path
-     * @returns
+     * @param path - the gs:// url
+     * @returns the read stream
      */
     async getReadStream(path) {
         const { bucket, key } = this.getInfo(path);
@@ -96,22 +103,20 @@ export class GCSFinder {
  * @WebdaModda GoogleCloudStorage
  */
 export default class Storage extends CloudBinary {
+    /**
+     * GCS client, created on first use
+     * @returns the GCS client
+     */
     get storage() {
         if (!this._storage) {
             this._storage = new GCS({ apiEndpoint: this.parameters.endpoint });
         }
         return this._storage;
     }
-    /**
-     * Load the parameters
-     *
-     * @param params
-     */
-    loadParameters(params) {
-        return new StorageParameters(params, this);
-    }
     /**
      * @override
+     * @param info - the binary map
+     * @returns the content stream
      */
     async _get(info) {
         const key = this._getKey(info.hash);
@@ -119,6 +124,10 @@ export default class Storage extends CloudBinary {
     }
     /**
      * @override
+     * @param map - the binary map
+     * @param expires - expiration in seconds
+     * @param _context - the operation context
+     * @returns the signed url
      */
     getSignedUrlFromMap(map, expires, _context) {
         return this.getSignedUrl({
@@ -128,8 +137,11 @@ export default class Storage extends CloudBinary {
         });
     }
     /**
-     * Get object content in Buffer
-     * @param {StorageObject} params
+     * Get object content as a stream
+     * @param params - the object to read
+     * @param params.bucket - the bucket, default to the one predefined
+     * @param params.key - the object key
+     * @returns the content stream
      */
     async getContent({ bucket, key }) {
         return this.getStorageBucket(bucket).file(key).createReadStream();
@@ -137,14 +149,12 @@ export default class Storage extends CloudBinary {
     /**
      * Upload a local file to GCS bucket destination
      *
-     * @param key to add to
-     * @param body content of the object
-     * @param metadatas to put along the object
-     * @param bucket to use
+     * @param key - key to add to
+     * @param body - content of the object, a string is a local file path
+     * @param metadata - to put along the object
+     * @param bucket - to use
      */
-    async putObject(key, body, metadata = {}, bucket = this.parameters.bucket
-    //{ bucket, localPath, content, key }: PutObjectParams
-    ) {
+    async putObject(key, body, metadata = {}, bucket = this.parameters.bucket) {
         const file = this.getStorageBucket(bucket).file(key);
         let contentType = "application/octet-stream";
         let stream;
@@ -166,14 +176,17 @@ export default class Storage extends CloudBinary {
     /**
      * Return the Google Bucket directly
      *
-     * @param bucket name of the bucket default to the one predefined
-     * @returns
+     * @param bucket - name of the bucket default to the one predefined
+     * @returns the bucket
      */
     getStorageBucket(bucket = this.parameters.bucket) {
         return this.storage.bucket(bucket);
     }
     /**
      * @inheritdoc
+     * @param hash - the binary hash
+     * @param uuid - the object uuid
+     * @param property - the object property
      */
     async _cleanUsage(hash, uuid, property) {
         const suffix = property ? `${property}_${uuid}` : `_${uuid}`;
@@ -187,6 +200,8 @@ export default class Storage extends CloudBinary {
     }
     /**
      * @inheritdoc
+     * @param hash - the binary hash
+     * @returns the number of objects using the binary
      */
     async getUsageCount(hash) {
         const [files] = await this.getStorageBucket().getFiles({
@@ -196,6 +211,9 @@ export default class Storage extends CloudBinary {
     }
     /**
      * @inheritdoc
+     * @param object - the object to attach the binary to
+     * @param property - the object property
+     * @param file - the binary to store
      */
     async store(object, property, file) {
         this.checkMap(object, property);
@@ -208,37 +226,43 @@ export default class Storage extends CloudBinary {
                 challenge: file.challenge
             });
         }
-        await this.putMarker(file.hash, `${property}_${object.getUuid()}`, object.getStore().getName());
-        await this.uploadSuccess(object, property, file);
+        await this.putMarker(file.hash, `${property}_${object.getUUID()}`, useModelId(object.constructor));
+        await this.uploadSuccess(object, property, file.toBinaryFileInfo());
     }
     /**
      * Delete a file inside an existing bucket
-     * @param {DeleteObjectParams} params
+     * @param params - the object to delete
+     * @param params.bucket - the bucket, default to the one predefined
+     * @param params.key - the object key
      */
     async deleteObject({ bucket, key }) {
         await this.getStorageBucket(bucket).file(key).delete();
-        this._webda.log("DEBUG", `gs://${bucket}/${key} deleted`);
+        this.log("DEBUG", `gs://${bucket}/${key} deleted`);
     }
     /**
      * Move a file from one bucket to an other
-     * @param {StorageObject} source
-     * @param {StorageObject} destination
+     * @param source - the object to move
+     * @param destination - the new location
      */
     async moveObject(source, destination) {
         const newFile = this.getStorageBucket(destination.bucket).file(destination.key);
-        this._webda.log("DEBUG", `moveObject gs://${source.bucket}/${source.key} => gs://${destination.bucket}/${destination.key}`);
+        this.log("DEBUG", `moveObject gs://${source.bucket}/${source.key} => gs://${destination.bucket}/${destination.key}`);
         await this.getStorageBucket(source.bucket).file(source.key).move(newFile);
     }
     /**
-     * @inheritdoc
+     * Get a signed url for the client to upload the binary directly to GCS
+     * @param object - the object to attach the binary to
+     * @param property - the object property
+     * @param info - the binary information (hash, challenge), read from the context if not provided
+     * @param context - the operation context
+     * @returns the upload url, undefined if the binary is already uploaded
      */
-    async putRedirectUrl(ctx) {
-        let body = await ctx.getRequestBody();
-        const { uuid, store, property } = ctx.getParameters();
-        let targetStore = this._verifyMapAndStore(ctx);
-        let object = await targetStore.get(uuid);
-        let base64String = Buffer.from(body.hash, "hex").toString("base64");
-        let params = {
+    async putRedirectUrl(object, property, info, context) {
+        const body = info ?? (await context.getInput());
+        this.checkMap(object, property);
+        const uuid = object.getUUID();
+        const base64String = Buffer.from(body.hash, "hex").toString("base64");
+        const params = {
             bucket: this.parameters.bucket,
             key: this._getKey(body.hash, "data"),
             action: "write",
@@ -251,19 +275,19 @@ export default class Storage extends CloudBinary {
         // List bucket to check if the file already exist
         let challenge;
         try {
-            let res = await this.getStorageBucket().file(params.key).getMetadata();
+            const res = await this.getStorageBucket().file(params.key).getMetadata();
             challenge = res[0].metadata.challenge;
         }
-        catch (err) {
-            // Ignore error
+        catch {
+            // Ignore error: the data does not exist yet
         }
         await this.uploadSuccess(object, property, body);
-        await this.putMarker(body.hash, `${property}_${uuid}`, store);
+        await this.putMarker(body.hash, `${property}_${uuid}`, useModelId(object.constructor));
         // If the challenge is the same, no need to upload
         if (challenge && challenge === body.challenge) {
             return;
         }
-        let url = await this.getSignedUrl(params);
+        const url = await this.getSignedUrl(params);
         // Re-upload, we should probably queue for recheck
         return {
             url,
@@ -278,8 +302,12 @@ export default class Storage extends CloudBinary {
     }
     /**
      * Retrieve one signed URL to download the file in parameter
-     * @param {SignedUrlParams} params
-     * @returns {string} URL in order to download the file
+     * @param params.bucket - the bucket, default to the one predefined
+     * @param params.key - the object key
+     * @param params.expires - expiration in seconds
+     * @param params.action - the action allowed by the url
+     * @param params - the object and signature options
+     * @returns URL in order to download the file
      */
     async getSignedUrl({ bucket, key, expires = 3600, action = "read", ...params }) {
         const options = {
@@ -289,29 +317,33 @@ export default class Storage extends CloudBinary {
             expires: Date.now() + expires * 1000
         };
         const [url] = await this.getStorageBucket(bucket).file(key).getSignedUrl(options);
-        this._webda.log("TRACE", `The signed url for ${bucket}/${key} is ${url}.`);
+        this.log("TRACE", `The signed url for ${bucket}/${key} is ${url}.`);
         return url;
     }
     /**
      * Retrieve mandatory headers if needed by the cloud provider (ie. Azure)
      * Returns empty object if no headers are mandatory
-     * @returns {[key:string]: string} mandatory headers
+     * @returns mandatory headers
      */
     getSignedUrlHeaders() {
         return {};
     }
     /**
      * Retrieve public URL of this object
-     * @param {StorageModel} store
-     * @returns {string} Public URL in order to download the file
+     * @param params - the object
+     * @param params.bucket - the bucket, default to the one predefined
+     * @param params.key - the object key
+     * @returns Public URL in order to download the file
      */
     async getPublicUrl({ bucket, key }) {
         return this.getStorageBucket(bucket).file(key).publicUrl();
     }
     /**
      * Fetch an object's metadata
-     * @param {StorageModel} store
-     * @returns {any} Metadata
+     * @param params - the object
+     * @param params.bucket - the bucket, default to the one predefined
+     * @param params.key - the object key
+     * @returns size and content type
      */
     async getMeta({ bucket, key }) {
         const [metadata] = await this.getStorageBucket(bucket).file(key).getMetadata();
@@ -322,9 +354,10 @@ export default class Storage extends CloudBinary {
     }
     /**
      * Get a bucket size with a prefix
-     * @param bucket
-     * @param prefix on the bucket
-     * @param regex to filter files
+     * @param bucket - the bucket, default to the one predefined
+     * @param prefix - on the bucket
+     * @param regex - to filter files
+     * @returns the total size and count of files
      */
     async getBucketSize(bucket, prefix, regex) {
         let pageToken;
@@ -339,11 +372,13 @@ export default class Storage extends CloudBinary {
                     size += Number.parseInt(metadata.size);
                     count++;
                 }
-                catch (err) { }
+                catch {
+                    // Ignore files removed while computing
+                }
             };
         };
         do {
-            let [files, page, _] = await this.storage.bucket(bucket).getFiles({ maxResults: 1000, pageToken, prefix });
+            const [files, page] = await this.storage.bucket(bucket).getFiles({ maxResults: 1000, pageToken, prefix });
             files.filter(f => (regex ? f.name.match(regex) : true)).forEach(f => throttler.queue(dwl(f)));
             await throttler.wait();
             pageToken = page?.pageToken;
@@ -354,17 +389,29 @@ export default class Storage extends CloudBinary {
         };
     }
     /**
-     * @inheritdoc
+     * Add a usage marker for a binary
+     * @param hash - the binary hash
+     * @param uuid - the marker name: `${property}_${uuid}`
+     * @param model - the model identifier of the object
      */
-    async putMarker(hash, uuid, storeName) {
+    async putMarker(hash, uuid, model) {
         await this.getStorageBucket()
             .file(this._getKey(hash, uuid))
             .save("", {
             metadata: {
-                webdaStore: storeName
+                metadata: {
+                    webdaModel: model
+                }
             }
         });
     }
+    /**
+     * Delete every object under the prefix, used by tests
+     */
+    async __clean() {
+        const [files] = await this.getStorageBucket().getFiles({ prefix: this.parameters.prefix });
+        await Promise.all(files.map(f => f.delete()));
+    }
 }
 export { Storage };
-//# sourceMappingURL=storage.js.map
+//# sourceMappingURL=storage.service.js.map

package/lib/services/storage.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/services/storage.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,8 @@
 {
   "name": "@webda/gcp",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.3",
   "description": "Webda GCP Services implementation",
   "main": "lib/index.js",
-  "scripts": {
-    "build": "webda build",
-    "build:watch": "webda build --watch",
-    "pretest": "npm run build",
-    "lint": "prettier --check src/**/*",
-    "lint:fix": "prettier --write src/**/*",
-    "test": "c8 mocha",
-    "test:debug": "mocha src/**/*.spec.ts"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/loopingz/webda.io.git"
@@ -26,51 +17,54 @@
     "package.json"
   ],
   "author": "abalam666",
-  "license": "MIT",
+  "license": "LGPL-3.0-only",
   "bugs": {
     "url": "https://github.com/loopingz/webda.io/issues"
   },
   "homepage": "https://github.com/loopingz/webda.io#readme",
   "dependencies": {
-    "@google-cloud/firestore": "^7.0.0",
-    "@google-cloud/kms": "^4.0.1",
-    "@google-cloud/pubsub": "^4.0.1",
-    "@google-cloud/storage": "~7.12.0",
-    "@webda/core": "^4.0.0-beta.1",
-    "mime-types": "^2.1.35"
-  },
-  "c8": {
-    "report-dir": "./reports",
-    "reporter": [
-      "html",
-      "lcov",
-      "json",
-      "text"
-    ],
-    "exclude": [
-      "**/*.spec.ts",
-      "test/**/*"
-    ]
+    "@google-cloud/firestore": "^8.3.0",
+    "@google-cloud/kms": "^5.4.0",
+    "@google-cloud/pubsub": "^5.3.0",
+    "@google-cloud/storage": "~7.19.0",
+    "mime-types": "^3.0.2",
+    "@webda/ql": "4.0.0-beta.3",
+    "@webda/utils": "4.0.0-beta.3",
+    "@webda/core": "4.0.0-beta.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@testdeck/mocha": "^0.3.2",
-    "@types/node": "18.11.13",
-    "@webda/async": "^4.0.0-beta.1",
-    "@webda/shell": "^4.0.0-beta.1",
-    "sinon": "^18.0.0"
+    "@types/node": "25.5.0",
+    "@vitest/coverage-v8": "^4.1.2",
+    "jscodeshift": "^17.3.0",
+    "skott": "^0.35.8",
+    "typescript": "7.1.0-dev.20260929.1",
+    "vite": "^6.0.0",
+    "vitest": "^4.1.2",
+    "@webda/compiler": "^4.0.0-beta.3",
+    "@webda/test": "4.0.0-beta.3"
   },
   "type": "module",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.0.0"
   },
   "nx": {
     "implicitDependencies": [
-      "@webda/core",
-      "@webda/shell"
+      "@webda/core"
     ]
   },
-  "gitHead": "9f0c12d5e43b3484794b2a49c5701b8b9675c4a8"
-}
+  "scripts": {
+    "build": "webdac build",
+    "build:watch": "webdac build --watch",
+    "pretest": "npm run build",
+    "codemod": "jscodeshift --parser=ts --extensions=tsx,ts -t ../codemod/current.mjs src",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
+    "test": "vitest run",
+    "format": "prettier --check src/**/*",
+    "format:fix": "prettier --write src/**/*",
+    "deps:graph": "skott --showCircularDependencies --no-trackTypeOnlyDependencies --displayMode=raw -e .ts"
+  }
+}