@fraym/crud 0.15.0 → 0.16.0

package/README.md

@@ -20,7 +20,10 @@ You need to add the `Tenant-Id` header in order to use the graphQL Endpoint and
 Use the `crud` cli command to automatically apply your crud schemas to the crud service.
 
 Your type schemas have to match the glob you specify in the `CRUD_SCHEMA_GLOB` env variable (default: `./src/**/*.graphql`).
-You can specify the address (and port) of the crud service instance you use in the `CRUD_SERVER_ADDRESS` env variable (default: `127.0.0.1:9000`).
+
+Delivery API: You can specify the address (and port) of the crud service instance you use in the `CRUD_SERVER_ADDRESS` env variable (default: `127.0.0.1:9000`).
+
+Management API: You can specify the address (and port) of the crud service instance you use in the `CRUD_MANAGEMENT_SERVER_ADDRESS` env variable (default: `http://127.0.0.1`). You will also need to set the `CRUD_MANAGEMENT_API_TOKEN` variable. The value of that token has to match the token configured in the crud service.
 
 You might have a seperate permissions directory or file. As soon as your permissions schema enum is not part of the projections glob you can specify a `PERMISSIONS_SCHEMA_GLOB` env variable. It is empty by default but as soon as you provide it it will add the files in that glob to your projections schema, too.
 
@@ -34,6 +37,8 @@ Use a `.env` file or env variables to configure cte clients and the command:
 
 ```env
 CRUD_SERVER_ADDRESS=127.0.0.1:9000
+CRUD_MANAGEMENT_SERVER_ADDRESS=http://127.0.0.1
+CRUD_MANAGEMENT_API_TOKEN=
 CRUD_SCHEMA_GLOB=./src/crud/*.graphql
 PERMISSIONS_SCHEMA_GLOB=
 CRUD_NAMESPACE=

package/dist/cmd/crud.js

@@ -17,13 +17,15 @@ const run = async () => {
         .config({
         schemaGlob: "./src/**/*.graphql",
         permissionsSchemaGlob: "",
-        serverAddress: "127.0.0.1:9000",
+        serverAddress: "http://127.0.0.1",
+        apiToken: "",
         namespace: "",
     })
         .pkgConf("crud").argv;
     let schemaGlob = argv.schemaGlob;
     let permissionsSchemaGlob = argv.permissionsSchemaGlob;
     let serverAddress = argv.serverAddress;
+    let apiToken = argv.apiToken;
     let namespace = argv.namespace;
     if (process.env.CRUD_SCHEMA_GLOB) {
         schemaGlob = process.env.CRUD_SCHEMA_GLOB;
@@ -31,8 +33,11 @@ const run = async () => {
     if (process.env.PERMISSIONS_SCHEMA_GLOB) {
         permissionsSchemaGlob = process.env.PERMISSIONS_SCHEMA_GLOB;
     }
-    if (process.env.CRUD_SERVER_ADDRESS) {
-        serverAddress = process.env.CRUD_SERVER_ADDRESS;
+    if (process.env.CRUD_MANAGEMENT_SERVER_ADDRESS) {
+        serverAddress = process.env.CRUD_MANAGEMENT_SERVER_ADDRESS;
+    }
+    if (process.env.CRUD_MANAGEMENT_API_TOKEN) {
+        apiToken = process.env.CRUD_MANAGEMENT_API_TOKEN;
     }
     if (process.env.CRUD_NAMESPACE) {
         namespace = process.env.CRUD_NAMESPACE;
@@ -48,7 +53,7 @@ const run = async () => {
         loaders: [new graphql_file_loader_1.GraphQLFileLoader()],
     });
     const definitions = getTypeDefinition(schema, namespace);
-    await migrateSchemas(definitions, serverAddress, namespace);
+    await migrateSchemas(definitions, serverAddress, apiToken, namespace);
 };
 run();
 const getTypeDefinition = (schema, namespace) => {
@@ -220,25 +225,31 @@ const addNestedTypesToSchema = (definitions, nestedTypeName, nestedTypes) => {
         };
     }
     let newSchema = definitions[nestedTypeName].schema;
-    nestedTypes.push(nestedTypeName);
+    if (!nestedTypes.includes(nestedTypeName)) {
+        nestedTypes.push(nestedTypeName);
+    }
     nestedTypeDefinition.nestedTypes.forEach(nestedNestedTypeName => {
         const nestedSchemaData = addNestedTypesToSchema(definitions, nestedNestedTypeName, nestedTypes);
         if (nestedSchemaData.schema === "") {
             return;
         }
         newSchema += `\n${nestedSchemaData.schema}`;
-        nestedTypes.push(...nestedSchemaData.nestedTypes);
+        nestedSchemaData.nestedTypes.forEach(nestedType => {
+            if (!nestedTypes.includes(nestedType)) {
+                nestedTypes.push(nestedType);
+            }
+        });
     });
     return {
         schema: newSchema,
         nestedTypes: nestedTypes,
     };
 };
-const migrateSchemas = async (definitions, serverAddress, namespace) => {
+const migrateSchemas = async (definitions, serverAddress, apiToken, namespace) => {
     console.log(`Considering ${Object.keys(definitions).length} type definitions for migration.`);
     console.log(`Using server address ${serverAddress}`);
     console.log(`Using namespace ${namespace}`);
-    const managementClient = await (0, client_1.newManagementClient)({ serverAddress });
+    const managementClient = await (0, client_1.newManagementClient)({ serverAddress, apiToken });
     const existingTypeNames = (await managementClient.getAllTypes()).filter(name => name.startsWith(namespace) && !name.startsWith("Fraym"));
     let createSchema = "";
     let updateSchema = "";
@@ -260,7 +271,11 @@ const migrateSchemas = async (definitions, serverAddress, namespace) => {
                     return;
                 }
                 updateSchema += `\n${nestedSchemaData.schema}`;
-                nestedTypesToUpdate.push(...nestedSchemaData.nestedTypes);
+                nestedSchemaData.nestedTypes.forEach(nestedType => {
+                    if (!nestedTypesToUpdate.includes(nestedType)) {
+                        nestedTypesToUpdate.push(nestedType);
+                    }
+                });
             });
         }
     });
@@ -276,17 +291,21 @@ const migrateSchemas = async (definitions, serverAddress, namespace) => {
                 return;
             }
             createSchema += `\n${nestedSchemaData.schema}`;
-            nestedTypesToCreate.push(...nestedSchemaData.nestedTypes);
+            nestedSchemaData.nestedTypes.forEach(nestedType => {
+                if (!nestedTypesToCreate.includes(nestedType)) {
+                    nestedTypesToCreate.push(nestedType);
+                }
+            });
         });
     });
     if (typesToCreate.length > 0) {
         console.log(`Creating ${typesToCreate.length} types: ${typesToCreate}...`);
-        await managementClient.createTypes(createSchema);
+        await managementClient.upsertTypes(createSchema);
         console.log(`Created ${typesToCreate.length} types`);
     }
     if (typesToUpdate.length > 0) {
         console.log(`Updating ${typesToUpdate.length} types: ${typesToUpdate}...`);
-        await managementClient.updateTypes(updateSchema);
+        await managementClient.upsertTypes(updateSchema);
         console.log(`Updated ${typesToUpdate.length} types`);
     }
     if (typesToRemove.length > 0) {

package/dist/config/config.d.ts

@@ -1,7 +1,13 @@
-export interface ClientConfig {
+export interface DeliveryClientConfig {
     serverAddress: string;
     keepaliveInterval?: number;
     keepaliveTimeout?: number;
 }
-export declare const getEnvConfig: () => ClientConfig;
-export declare const useConfigDefaults: (config?: ClientConfig) => Required<ClientConfig>;
+export interface ManagementClientConfig {
+    serverAddress: string;
+    apiToken: string;
+}
+export declare const getEnvDeliveryConfig: () => DeliveryClientConfig;
+export declare const getEnvManagementConfig: () => ManagementClientConfig;
+export declare const useDeliveryConfigDefaults: (config?: DeliveryClientConfig) => Required<DeliveryClientConfig>;
+export declare const useManagementConfigDefaults: (config?: ManagementClientConfig) => Required<ManagementClientConfig>;

package/dist/config/config.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useConfigDefaults = exports.getEnvConfig = void 0;
+exports.useManagementConfigDefaults = exports.useDeliveryConfigDefaults = exports.getEnvManagementConfig = exports.getEnvDeliveryConfig = void 0;
 const dotenv_1 = require("dotenv");
-const getEnvConfig = () => {
+const getEnvDeliveryConfig = () => {
     var _a;
     (0, dotenv_1.config)();
-    const serverAddress = (_a = process.env.CRUD_SERVER_ADDRESS) !== null && _a !== void 0 ? _a : "";
+    const serverAddress = (_a = process.env.PROJECTIONS_SERVER_ADDRESS) !== null && _a !== void 0 ? _a : "";
     let keepaliveInterval;
     let keepaliveTimeout;
-    const keepaliveIntervalString = process.env.CRUD_CONNECTION_KEEPALIVE_INTERVAL;
-    const keepaliveTimeoutString = process.env.CRUD_CONNECTION_KEEPALIVE_INTERVAL;
+    const keepaliveIntervalString = process.env.PROJECTIONS_CONNECTION_KEEPALIVE_INTERVAL;
+    const keepaliveTimeoutString = process.env.PROJECTIONS_CONNECTION_KEEPALIVE_INTERVAL;
     if (keepaliveIntervalString) {
         keepaliveInterval = parseInt(keepaliveIntervalString, 10);
     }
@@ -22,11 +22,20 @@ const getEnvConfig = () => {
         keepaliveTimeout,
     };
 };
-exports.getEnvConfig = getEnvConfig;
-const useConfigDefaults = (config) => {
+exports.getEnvDeliveryConfig = getEnvDeliveryConfig;
+const getEnvManagementConfig = () => {
+    var _a, _b;
+    (0, dotenv_1.config)();
+    return {
+        serverAddress: (_a = process.env.PROJECTIONS_MANAGEMENT_SERVER_ADDRESS) !== null && _a !== void 0 ? _a : "",
+        apiToken: (_b = process.env.PROJECTIONS_MANAGEMENT_API_TOKEN) !== null && _b !== void 0 ? _b : "",
+    };
+};
+exports.getEnvManagementConfig = getEnvManagementConfig;
+const useDeliveryConfigDefaults = (config) => {
     var _a, _b;
     if (!config) {
-        config = (0, exports.getEnvConfig)();
+        config = (0, exports.getEnvDeliveryConfig)();
     }
     return {
         serverAddress: config.serverAddress,
@@ -34,4 +43,14 @@ const useConfigDefaults = (config) => {
         keepaliveInterval: (_b = config.keepaliveInterval) !== null && _b !== void 0 ? _b : 40 * 1000,
     };
 };
-exports.useConfigDefaults = useConfigDefaults;
+exports.useDeliveryConfigDefaults = useDeliveryConfigDefaults;
+const useManagementConfigDefaults = (config) => {
+    if (!config) {
+        config = (0, exports.getEnvManagementConfig)();
+    }
+    return {
+        serverAddress: config.serverAddress,
+        apiToken: config.apiToken,
+    };
+};
+exports.useManagementConfigDefaults = useManagementConfigDefaults;

package/dist/delivery/client.d.ts

@@ -1,4 +1,4 @@
-import { ClientConfig } from "../config/config";
+import { DeliveryClientConfig } from "../config/config";
 import { CreatedCrudData } from "./create";
 import { GetCrudDataList } from "./getDataList";
 import { Filter } from "./filter";
@@ -11,4 +11,4 @@ export interface DeliveryClient {
     getDataList: <T extends {}>(tenantId: string, type: string, limit?: number, page?: number, filter?: Filter, order?: Order[]) => Promise<GetCrudDataList<T>>;
     close: () => Promise<void>;
 }
-export declare const newDeliveryClient: (config?: ClientConfig) => Promise<DeliveryClient>;
+export declare const newDeliveryClient: (config?: DeliveryClientConfig) => Promise<DeliveryClient>;

package/dist/delivery/client.js

@@ -10,7 +10,7 @@ const delete_1 = require("./delete");
 const getData_1 = require("./getData");
 const getDataList_1 = require("./getDataList");
 const newDeliveryClient = async (config) => {
-    config = (0, config_1.useConfigDefaults)(config);
+    config = (0, config_1.useDeliveryConfigDefaults)(config);
     const serviceClient = new crud_proto_1.DeliveryServiceClient(config.serverAddress, grpc_js_1.credentials.createInsecure(), {
         "grpc.keepalive_time_ms": config.keepaliveInterval,
         "grpc.keepalive_timeout_ms": config.keepaliveTimeout,

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export * from "./delivery/client";
 export * from "./management/client";
 export { Filter, FieldFilter } from "./delivery/filter";
 export { Order } from "./delivery/order";
-export { ClientConfig, getEnvConfig } from "./config/config";
+export * from "./config/config";

package/dist/index.js

@@ -14,8 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvConfig = void 0;
 __exportStar(require("./delivery/client"), exports);
 __exportStar(require("./management/client"), exports);
-var config_1 = require("./config/config");
-Object.defineProperty(exports, "getEnvConfig", { enumerable: true, get: function () { return config_1.getEnvConfig; } });
+__exportStar(require("./config/config"), exports);

package/dist/management/client.d.ts

@@ -1,9 +1,7 @@
-import { ClientConfig } from "../config/config";
+import { ManagementClientConfig } from "../config/config";
 export interface ManagementClient {
-    createTypes: (schema: string) => Promise<void>;
-    updateTypes: (schema: string) => Promise<void>;
+    upsertTypes: (schema: string) => Promise<void>;
     removeTypes: (typeNames: string[]) => Promise<void>;
     getAllTypes: () => Promise<string[]>;
-    close: () => Promise<void>;
 }
-export declare const newManagementClient: (config?: ClientConfig) => Promise<ManagementClient>;
+export declare const newManagementClient: (config?: ManagementClientConfig) => Promise<ManagementClient>;

package/dist/management/client.js

@@ -1,41 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newManagementClient = void 0;
-const crud_proto_1 = require("@fraym/crud-proto");
-const grpc_js_1 = require("@grpc/grpc-js");
 const config_1 = require("../config/config");
-const create_1 = require("./create");
 const getAll_1 = require("./getAll");
 const remove_1 = require("./remove");
-const update_1 = require("./update");
+const upsert_1 = require("./upsert");
 const newManagementClient = async (config) => {
-    config = (0, config_1.useConfigDefaults)(config);
-    const serviceClient = new crud_proto_1.ManagementServiceClient(config.serverAddress, grpc_js_1.credentials.createInsecure(), {
-        "grpc.keepalive_time_ms": config.keepaliveInterval,
-        "grpc.keepalive_timeout_ms": config.keepaliveTimeout,
-        "grpc.keepalive_permit_without_calls": 1,
-    });
-    const createTypes = async (schema) => {
-        await (0, create_1.createCrudTypes)(schema, serviceClient);
-    };
-    const updateTypes = async (schema) => {
-        await (0, update_1.updateCrudTypes)(schema, serviceClient);
+    const currentConfig = (0, config_1.useManagementConfigDefaults)(config);
+    const upsertTypes = async (schema) => {
+        await (0, upsert_1.upsertCrudTypes)(schema, currentConfig);
     };
     const removeTypes = async (typeNames) => {
-        await (0, remove_1.removeCrudTypes)(typeNames, serviceClient);
+        await (0, remove_1.removeCrudTypes)(typeNames, currentConfig);
     };
     const getAllTypes = async () => {
-        return await (0, getAll_1.getAllCrudTypes)(serviceClient);
-    };
-    const close = async () => {
-        serviceClient.close();
+        return await (0, getAll_1.getAllCrudTypes)(currentConfig);
     };
     return {
-        createTypes,
-        updateTypes,
+        upsertTypes,
         removeTypes,
         getAllTypes,
-        close,
     };
 };
 exports.newManagementClient = newManagementClient;

package/dist/management/getAll.d.ts

@@ -1,2 +1,2 @@
-import { ManagementServiceClient } from "@fraym/crud-proto";
-export declare const getAllCrudTypes: (serviceClient: ManagementServiceClient) => Promise<string[]>;
+import { ManagementClientConfig } from "config/config";
+export declare const getAllCrudTypes: (config: ManagementClientConfig) => Promise<string[]>;

package/dist/management/getAll.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllCrudTypes = void 0;
-const getAllCrudTypes = async (serviceClient) => {
-    return new Promise((resolve, reject) => {
-        serviceClient.getTypes({}, (error, response) => {
-            if (error) {
-                reject(error.message);
-                return;
-            }
-            resolve(response.typeNames);
-        });
+const getAllCrudTypes = async (config) => {
+    const response = await fetch(`${config.serverAddress}/management/types`, {
+        method: "GET",
+        headers: {
+            Authorization: `Bearer ${config.apiToken}`,
+        },
     });
+    const data = await response.json();
+    return data.typeNames;
 };
 exports.getAllCrudTypes = getAllCrudTypes;

package/dist/management/remove.d.ts

@@ -1,2 +1,2 @@
-import { ManagementServiceClient } from "@fraym/crud-proto";
-export declare const removeCrudTypes: (typeNames: string[], serviceClient: ManagementServiceClient) => Promise<void>;
+import { ManagementClientConfig } from "config/config";
+export declare const removeCrudTypes: (typeNames: string[], config: ManagementClientConfig) => Promise<void>;

package/dist/management/remove.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeCrudTypes = void 0;
-const removeCrudTypes = async (typeNames, serviceClient) => {
-    return new Promise((resolve, reject) => {
-        serviceClient.removeTypes({
+const removeCrudTypes = async (typeNames, config) => {
+    await fetch(`${config.serverAddress}/management/types`, {
+        method: "DELETE",
+        headers: {
+            Authorization: `Bearer ${config.apiToken}`,
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
             typeNames,
-        }, error => {
-            if (error) {
-                reject(error.message);
-                return;
-            }
-            resolve();
-        });
+        }),
     });
 };
 exports.removeCrudTypes = removeCrudTypes;

package/dist/management/upsert.d.ts

@@ -0,0 +1,2 @@
+import { ManagementClientConfig } from "config/config";
+export declare const upsertCrudTypes: (schema: string, config: ManagementClientConfig) => Promise<void>;

package/dist/management/upsert.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upsertCrudTypes = void 0;
+const upsertCrudTypes = async (schema, config) => {
+    await fetch(`${config.serverAddress}/management/types`, {
+        method: "POST",
+        headers: {
+            Authorization: `Bearer ${config.apiToken}`,
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            schema,
+        }),
+    });
+};
+exports.upsertCrudTypes = upsertCrudTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/crud",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/crud-nodejs",
     "repository": {

package/dist/management/create.d.ts

@@ -1,2 +0,0 @@
-import { ManagementServiceClient } from "@fraym/crud-proto";
-export declare const createCrudTypes: (schema: string, serviceClient: ManagementServiceClient) => Promise<void>;

package/dist/management/create.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCrudTypes = void 0;
-const createCrudTypes = async (schema, serviceClient) => {
-    return new Promise((resolve, reject) => {
-        serviceClient.createTypes({
-            schema,
-        }, error => {
-            if (error) {
-                reject(error.message);
-                return;
-            }
-            resolve();
-        });
-    });
-};
-exports.createCrudTypes = createCrudTypes;

package/dist/management/update.d.ts

@@ -1,2 +0,0 @@
-import { ManagementServiceClient } from "@fraym/crud-proto";
-export declare const updateCrudTypes: (schema: string, serviceClient: ManagementServiceClient) => Promise<void>;

package/dist/management/update.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCrudTypes = void 0;
-const updateCrudTypes = async (schema, serviceClient) => {
-    return new Promise((resolve, reject) => {
-        serviceClient.updateTypes({
-            schema,
-        }, error => {
-            if (error) {
-                reject(error.message);
-                return;
-            }
-            resolve();
-        });
-    });
-};
-exports.updateCrudTypes = updateCrudTypes;