@webda/gcp 3.6.3 → 4.0.0-beta.2

package/lib/services/storage.spec.js

@@ -6,73 +6,63 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Storage as GCS } from "@google-cloud/storage";
 import { suite, test } from "@testdeck/mocha";
-import { getCommonJS } from "@webda/core";
+import { BinaryService, getCommonJS, RESTDomainService } from "@webda/core";
 import { BinaryTest } from "@webda/core/lib/services/binary.spec.js";
 import * as assert from "assert";
 import * as path from "path";
 import * as sinon from "sinon";
+import { GCSFinder, Storage } from "./storage.js";
 const { __dirname } = getCommonJS(import.meta.url);
-class MockFile {
-    constructor(path) { }
-    async delete() { }
-    async getFiles() { }
-    async exists() { }
-    async save() { }
-    async setMetadata() { }
-    async createWriteStream() { }
-    async getSignedUrl() { }
-    async publicUrl() { }
-    async getMetadata() { }
-    async createReadStream() { }
-    async move() { }
-}
-class MockBucket {
-    file(path) {
-        return new MockFile(path);
-    }
-}
 const BUCKET = "webda-dev";
 let StorageTest = class StorageTest extends BinaryTest {
     async before() {
-        this.buildWebda();
+        this.apiEndpoint = process.env["GCS_API_ENDPOINT"] || "";
+        await this.buildWebda();
         await this.install();
         await super.before();
-        this.prefix = this.getBinary().getWebda().getUuid();
-        this.getBinary().getParameters().prefix = this.prefix;
-        // Prepare for Mocked Version
-        if (!process.env.NO_MOCK && false) {
-            sinon.stub(this.getBinary(), "getStorageBucket").callsFake(() => {
-                return new MockBucket();
-            });
-        }
+    }
+    getBinary() {
+        this.prefix = this.webda.getUuid();
+        return this.addService(Storage, {
+            bucket: "webda-dev",
+            endpoint: this.apiEndpoint,
+            prefix: this.prefix
+        });
     }
     async after() {
         await this.cleanData();
     }
     async install() {
-        var storage = new GCS();
+        const storage = new GCS({ apiEndpoint: this.apiEndpoint });
         try {
-            let [metadata] = await storage.bucket(BUCKET).getMetadata();
-            if (!metadata) {
+            const [exists] = await storage.bucket(BUCKET).exists();
+            if (!exists) {
+                console.log("INFO", `Google cloud storage creating bucket '${BUCKET}'`);
                 await storage.createBucket(BUCKET, {
                     location: "US-WEST2",
                     storageClass: "COLDLINE"
                 });
-                await storage.bucket(BUCKET).getMetadata();
             }
-            //this.webda.log("INFO", `Google cloud storage bucket '${BUCKET}' exists`);
+            else {
+                await this.cleanData();
+            }
         }
         catch (e) {
-            this.webda.log("ERROR", `Google cloud storage error (${e.message})`);
+            console.log("ERROR", `Google Cloud Storage error (${e.message})`);
         }
     }
     async cleanData() {
-        var storage = new GCS();
-        const [files] = await storage.bucket(BUCKET).getFiles({
-            prefix: this.prefix
-        });
-        for (let file of files) {
-            await file.delete();
+        const storage = new GCS({ apiEndpoint: this.apiEndpoint });
+        try {
+            const [files] = await storage.bucket(BUCKET).getFiles({
+                prefix: this.prefix
+            });
+            for (const file of files) {
+                await file.delete();
+            }
+        }
+        catch (err) {
+            console.error("Error cleaning up", err);
         }
     }
     // Override getNotFound as exception is raised after
@@ -81,8 +71,8 @@ let StorageTest = class StorageTest extends BinaryTest {
     async putObject() {
         const body = `RAW Body: ${new Date()}`;
         const name = `${this.prefix}/plop/test`;
-        await this.getBinary().putObject(name, Buffer.from(body), { meta1: "meta1" }, BUCKET);
-        let getFile = this.getBinary().getStorageBucket().file(name);
+        await this.binary.putObject(name, Buffer.from(body), { meta1: "meta1" }, BUCKET);
+        const getFile = this.binary.getStorageBucket().file(name);
         assert.deepStrictEqual((await getFile.getMetadata())[0].metadata, {
             meta1: "meta1"
         });
@@ -94,56 +84,99 @@ let StorageTest = class StorageTest extends BinaryTest {
         // Skip it
     }
     async redirectUrl() {
-        let { user1, ctx } = await this.setupDefault();
+        const { user1, ctx } = await this.setupDefault();
+        await this.addService(RESTDomainService, {});
         // Making sure we are redirected on GET
-        let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0`, {});
+        const executor = this.getExecutor(ctx, "test.webda.io", "GET", `${this.webda.getRouter().getModelUrl(user1)}/${user1.getUuid()}/images/0`, {});
         await executor.execute(ctx);
         assert.ok(ctx.getResponseHeaders().Location !== undefined);
     }
-    async challenge() {
-        await this.testChallenge(false);
-    }
     async redirectUrlInfo() {
-        let { user1, ctx } = await this.setupDefault();
+        const { user1, ctx } = await this.setupDefault();
+        await this.addService(RESTDomainService, {});
         // Making sure we are redirected on GET
-        let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0/url`, {});
+        const executor = this.getExecutor(ctx, "test.webda.io", "GET", `${this.webda.getRouter().getModelUrl(user1)}/${user1.getUuid()}/images/0/url`, {});
         await executor.execute(ctx);
         assert.ok(ctx.getResponseHeaders().Location === undefined);
         assert.notStrictEqual(JSON.parse(ctx.getResponseBody()).Location, undefined);
     }
     async cascadeDelete() {
-        let stubDelete = sinon.stub(this.getBinary(), "_cleanUsage").callsFake(() => {
+        const stubDelete = sinon.stub(await this.getBinary(), "_cleanUsage").callsFake(() => {
             throw new Error();
         });
         try {
             // @ts-ignore
-            await this.getBinary().cascadeDelete({ hash: "pp" }, "pp");
+            await (await this.getBinary()).cascadeDelete({ hash: "pp" }, "pp");
         }
         finally {
             stubDelete.restore();
         }
     }
     async defaultGCS() {
-        let { user1, ctx } = await this.setupDefault();
+        const { user1, ctx } = await this.setupDefault();
         // COV for double
-        const binary = this.getBinary();
+        const binary = await this.getBinary();
         const from = `${this.prefix}/rawAccess`;
         const to = `${this.prefix}/movedAccess`;
         await binary.putObject(from, path.join(__dirname, "..", "..", "test", "Dockerfile.txt"));
+        // Test GCS
+        const finder = new GCSFinder({ apiEndpoint: this.apiEndpoint });
+        const stub = sinon.stub();
+        let files = await finder.find("gs://webda-dev/", { processor: stub });
+        assert.strictEqual(stub.callCount, files.length);
+        assert.notStrictEqual(files.length, 0);
+        files = await finder.find(`gs://webda-dev/${this.prefix}`, { filterPattern: /rawAccess$/, processor: stub });
+        assert.strictEqual(files.length, 1);
+        const writer = await finder.getWriteStream(`gs://webda-dev/${this.prefix}/test.txt`);
+        writer.write("test");
+        const p = new Promise(resolve => {
+            writer.on("finish", resolve);
+        });
+        writer.end();
+        await p;
+        assert.strictEqual((await BinaryService.streamToBuffer(await finder.getReadStream(`gs://webda-dev/${this.prefix}/test.txt`))).toString(), "test");
+        assert.throws(() => finder.getInfo("s3://test/plop.txt"), /Invalid protocol path should be gs:/);
+        //
         await binary.moveObject({ key: from }, { key: to });
         assert.deepStrictEqual(binary.getSignedUrlHeaders(), {});
         const meta = await binary.getMeta({ bucket: "webda-dev", key: to });
         assert.deepStrictEqual(meta, { size: 311, contentType: "text/plain" });
-        assert.ok(/https:\/\/storage\.googleapis\.com\/webda-dev\/webda-dev/.exec(await binary.getPublicUrl({ key: "webda-dev" })));
+        const url = await binary.getPublicUrl({ key: "webda-dev" });
+        assert.ok(/\/webda-dev\/webda-dev/.exec(url));
+        if (this.apiEndpoint) {
+            assert.ok(url.startsWith(this.apiEndpoint));
+        }
+        else {
+            assert.ok(url.startsWith("https://storage.googleapis.com"));
+        }
         await binary.deleteObject({ key: to });
     }
+    /**
+     * Overwrite the send challenge data to use GCS
+     * @param info
+     * @param data
+     */
+    async sendChallengeData(info, data) {
+        const url = new URL(info.url);
+        const metadata = {};
+        Object.keys(info.headers)
+            .filter(k => k.startsWith("x-goog-meta-"))
+            .forEach(k => {
+            metadata[k.substring(12)] = info.headers[k];
+        });
+        const file = new GCS({ apiEndpoint: this.apiEndpoint })
+            .bucket(BUCKET)
+            .file(url.pathname.substring(2 + BUCKET.length));
+        await file.save(data);
+        await file.setMetadata({ metadata: metadata });
+    }
     async bucketSize() {
-        const binary = this.getBinary();
+        const binary = await this.getBinary();
         sinon.stub(binary["storage"], "bucket").callsFake(() => {
             return {
                 getFiles: ({ pageToken }) => {
-                    let res = [];
-                    let offset = pageToken ? parseInt(pageToken) : 1;
+                    const res = [];
+                    const offset = pageToken ? parseInt(pageToken) : 1;
                     for (let i = offset; i < 100 + offset; i++) {
                         res.push({ name: `a${i}`, getMetadata: async () => [{ size: pageToken ? "20" : "100" }] });
                     }
@@ -173,9 +206,6 @@ __decorate([
 __decorate([
     test
 ], StorageTest.prototype, "redirectUrl", null);
-__decorate([
-    test
-], StorageTest.prototype, "challenge", null);
 __decorate([
     test
 ], StorageTest.prototype, "redirectUrlInfo", null);

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

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

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@webda/gcp",
-  "version": "3.6.3",
+  "version": "4.0.0-beta.2",
   "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/**/*",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
     "test": "c8 mocha",
-    "test:debug": "mocha src/**/*.spec.ts"
+    "test:debug": "mocha src/**/*.spec.ts",
+    "format": "prettier --check src/**/*",
+    "format:fix": "prettier --write src/**/*"
   },
   "repository": {
     "type": "git",
@@ -26,7 +28,7 @@
     "package.json"
   ],
   "author": "abalam666",
-  "license": "MIT",
+  "license": "LGPL-3.0-only",
   "bugs": {
     "url": "https://github.com/loopingz/webda.io/issues"
   },
@@ -35,8 +37,9 @@
     "@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": "^3.16.3",
+    "@google-cloud/storage": "~7.13.0",
+    "@webda/core": "^4.0.0-beta.2",
+    "@webda/ql": "^4.0.0-beta.2",
     "mime-types": "^2.1.35"
   },
   "c8": {
@@ -57,15 +60,15 @@
   },
   "devDependencies": {
     "@testdeck/mocha": "^0.3.2",
-    "@types/node": "18.11.13",
-    "@webda/async": "^3.7.3",
-    "@webda/shell": "^3.11.1",
-    "sinon": "^18.0.0",
-    "uuid": "^10.0.0"
+    "@types/node": "20.0.0",
+    "@webda/async": "^4.0.0-beta.2",
+    "@webda/shell": "^4.0.0-beta.2",
+    "sinon": "^19.0.2",
+    "tsx": "^4.17.0"
   },
   "type": "module",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "nx": {
     "implicitDependencies": [
@@ -73,5 +76,5 @@
       "@webda/shell"
     ]
   },
-  "gitHead": "3424571d0cbdcbdc05ba699c20c802fe3641f4aa"
+  "gitHead": "e992dcfb82cefa6cd5c61c54a0e63778b6f53d8e"
 }

package/webda.module.json

@@ -80,15 +80,6 @@
           "description": "Additional models\n\nAllow this store to manage other models",
           "default": []
         },
-        "asyncDelete": {
-          "type": "boolean",
-          "description": "async delete"
-        },
-        "expose": {
-          "$ref": "#/definitions/StoreExposeParameters",
-          "description": "Expose the service to an urls",
-          "deprecated": "will probably be removed in 4.0 in favor of Expose annotation"
-        },
         "strict": {
           "type": "boolean",
           "description": "Allow to load object that does not have the type data\n\nIf set to true, then the Store will only managed the defined _model and no model extending this one",
@@ -137,7 +128,6 @@
         }
       },
       "required": [
-        "asyncDelete",
         "collection",
         "compoundIndexes",
         "slowQueryThreshold",
@@ -146,53 +136,6 @@
       "description": "Firebase parameters",
       "$schema": "http://json-schema.org/draft-07/schema#",
       "definitions": {
-        "StoreExposeParameters": {
-          "type": "object",
-          "properties": {
-            "url": {
-              "type": "string",
-              "description": "URL endpoint to use to expose REST Resources API",
-              "default": "service.getName().toLowerCase()"
-            },
-            "restrict": {
-              "type": "object",
-              "properties": {
-                "create": {
-                  "type": "boolean",
-                  "description": "Do not expose the POST"
-                },
-                "update": {
-                  "type": "boolean",
-                  "description": "Do not expose the PUT and PATCH"
-                },
-                "get": {
-                  "type": "boolean",
-                  "description": "Do not expose the GET"
-                },
-                "delete": {
-                  "type": "boolean",
-                  "description": "Do not expose the DELETE"
-                },
-                "query": {
-                  "type": "boolean",
-                  "description": "Do not expose the query endpoint"
-                }
-              },
-              "description": "You can restrict any part of the CRUD",
-              "default": {}
-            },
-            "queryMethod": {
-              "type": "string",
-              "enum": [
-                "PUT",
-                "GET"
-              ],
-              "description": "For confidentiality sometimes you might prefer to expose query through PUT To avoid GET logging",
-              "default": "GET"
-            }
-          },
-          "deprecated": "Store should not be exposed directly anymore\nYou should use the DomainService instead"
-        },
         "FireStoreIndex": {
           "type": "object",
           "additionalProperties": {
@@ -1501,6 +1444,14 @@
           "type": "number",
           "description": "Timeout when receiveMessage is used before returning empty result (in ms)\n\nIf not define then no timeout is applied and receiveMessage can hang forever"
         },
+        "mode": {
+          "type": "string",
+          "enum": [
+            "consumer",
+            "receiver"
+          ],
+          "description": "If receiver, the usage is to call receiveMessage and deleteMessage manually If consumer, the usage is to call consume, the normal flow is used in parallel"
+        },
         "openapi": {
           "type": "object",
           "additionalProperties": true
@@ -1508,6 +1459,7 @@
       },
       "required": [
         "maxConsumers",
+        "mode",
         "subscription",
         "topic",
         "type"
@@ -1527,17 +1479,6 @@
           "type": "string",
           "description": "URL on which to serve the content"
         },
-        "map": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "description": "Define the map to Object collection\n\nkey is a Store name the string[] represent all valids attributes to store files in",
-          "deprecated": true
-        },
         "models": {
           "type": "object",
           "additionalProperties": {
@@ -1548,41 +1489,10 @@
           },
           "description": "Define the map of models\n* indicates all models\n\nkey is a Store name the string[] represent all valids attributes to store files in * indicates all attributes"
         },
-        "expose": {
-          "type": "object",
-          "properties": {
-            "url": {
-              "type": "string",
-              "description": "URL to expose the service to"
-            },
-            "restrict": {
-              "type": "object",
-              "properties": {
-                "get": {
-                  "type": "boolean",
-                  "description": "Restrict GET"
-                },
-                "create": {
-                  "type": "boolean",
-                  "description": "Restrict POST"
-                },
-                "delete": {
-                  "type": "boolean",
-                  "description": "Restrict DELETE"
-                },
-                "metadata": {
-                  "type": "boolean",
-                  "description": "Restrict update of metadata"
-                }
-              },
-              "description": "Restrict some APIs"
-            }
-          },
-          "required": [
-            "url"
-          ],
-          "description": "Expose the service to http",
-          "deprecated": "will be removed in 4.0"
+        "maxFileSize": {
+          "type": "number",
+          "description": "Define the maximum filesize to accept as direct upload",
+          "default": "10*1024*1024"
         },
         "prefix": {
           "type": "string"
@@ -1590,6 +1500,10 @@
         "bucket": {
           "type": "string"
         },
+        "endpoint": {
+          "type": "string",
+          "description": "Specify endpoint for GCS"
+        },
         "openapi": {
           "type": "object",
           "additionalProperties": true
@@ -1597,7 +1511,6 @@
       },
       "required": [
         "bucket",
-        "map",
         "models",
         "type"
       ],