@remkoj/optimizely-graph-cli 1.0.3 → 2.0.0-pre1

package/bin/index.js

@@ -18,7 +18,7 @@ import createAdminApi, { isApiError } from '@remkoj/optimizely-graph-client/admi
 import chalk from 'chalk';
 import figures from 'figures';
 import Table from 'cli-table3';
-import { createHmacFetch } from '@remkoj/optimizely-graph-client/client';
+import ChannelRepository from '@remkoj/optimizely-graph-client/channels';
 import fs from 'node:fs';
 
 function processEnvFile(suffix = "") {
@@ -58,7 +58,7 @@ function createCliApp(scriptName, version, epilogue) {
         .option('verbose', { description: "Enable query logging", boolean: true, type: 'boolean', demandOption: false, default: config.query_log })
         .demandCommand(1, 1)
         .showHelpOnFail(true)
-        .epilogue(epilogue ?? `Copyright Remko Jantzen - 2023-${(new Date(Date.now())).getFullYear()}`)
+        .epilogue(`Copyright Remko Jantzen - 2023-${(new Date(Date.now())).getFullYear()}`)
         .help();
 }
 function getArgsConfig(args) {
@@ -83,7 +83,7 @@ function getFrontendURL(config) {
 }
 
 const publishToVercelModule$2 = {
-    command: ['register [path] [verb]'],
+    command: ['webhook:create [path] [verb]', 'wc [path] [verb]', 'register [path] [verb]'],
     handler: async (args) => {
         const cgConfig = getArgsConfig(args);
         const frontendUrl = getFrontendURL(cgConfig);
@@ -164,7 +164,7 @@ const publishToVercelModule$2 = {
 };
 
 const publishToVercelModule$1 = {
-    command: ['unregister [path]'],
+    command: ['webhook:delete [path]', 'wd [path]', 'unregister [path]'],
     handler: async (args) => {
         const cgConfig = getArgsConfig(args);
         const hookPath = args.path ?? '/';
@@ -245,7 +245,7 @@ const publishToVercelModule$1 = {
 };
 
 const publishToVercelModule = {
-    command: ['list'],
+    command: ['webhook:list', 'wl', 'list'],
     handler: async (args) => {
         const cgConfig = getArgsConfig(args);
         if (!cgConfig.app_key || !cgConfig.secret)
@@ -284,74 +284,59 @@ const publishToVercelModule = {
 
 const DEFAULT_CONFIG_FILE = "src/site-config.ts";
 const createSiteConfigModule = {
-    command: ['site-config [file_path]'],
+    command: ['config:create [file_path]', 'cc [file_path]', 'site-config [file_path]'],
     handler: async (args) => {
         const cgConfig = getArgsConfig(args);
         if (!cgConfig.app_key || !cgConfig.secret)
             throw new Error("Make sure both the Optimizely Graph App Key & Secret have been defined");
-        const cgFetch = createHmacFetch(cgConfig.app_key, cgConfig.secret);
         const siteHost = getFrontendURL(cgConfig).host;
         const targetFile = args.file_path ?? DEFAULT_CONFIG_FILE;
         process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Generating configuration file for website with domain: ${chalk.yellow(siteHost)}\n`);
-        let response = await cgFetch(new URL('/content/v2', cgConfig.gateway), { method: "POST", body: JSON.stringify(siteQuery(siteHost)) });
-        if (!response.ok) {
+        const channelRepo = new ChannelRepository(cgConfig);
+        let channel = null;
+        try {
+            channel = await channelRepo.getByDomain(siteHost, false);
+        }
+        catch (e) {
+            if (args.verbose ?? false) {
+                process.stderr.write(chalk.redBright(chalk.bold(figures.cross) + " " + (new String(e))) + "\n");
+            }
             process.stdout.write(chalk.redBright(chalk.bold(figures.cross) + " Failed loading website data"));
             process.exitCode = 1;
             return;
         }
-        let responseBody = await response.json();
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) < 1) {
-            process.stdout.write(`${chalk.red(chalk.bold(figures.bullet))} Domain not found, falling back to match-all domain: ${chalk.yellow("*")}\n`);
-            response = await cgFetch(new URL('/content/v2', cgConfig.gateway), { method: "POST", body: JSON.stringify(siteQuery("*")) });
-            if (!response.ok) {
+        if (!channel) {
+            try {
+                process.stdout.write(`${chalk.red(chalk.bold(figures.bullet))} Domain not found, falling back to match-all domain: ${chalk.yellow("*")}\n`);
+                channel = await channelRepo.getByDomain(siteHost, true);
+            }
+            catch (e) {
+                if (args.verbose ?? false) {
+                    process.stderr.write(chalk.redBright(chalk.bold(figures.cross) + " " + (new String(e))) + "\n");
+                }
                 process.stdout.write(chalk.redBright(chalk.bold(figures.cross) + " Failed loading website data"));
                 process.exitCode = 1;
                 return;
             }
-            responseBody = await response.json();
         }
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) < 1) {
+        if (!channel || channel == null) {
             process.stdout.write(chalk.redBright(`${chalk.bold(figures.cross)} No website defintion found for host ${siteHost}`) + "\n");
             process.exitCode = 1;
             return;
         }
-        if ((responseBody.data?.SiteDefinition?.items?.length ?? 0) > 1) {
-            process.stdout.write(chalk.redBright(`${chalk.bold(figures.cross)} Multiple website defintion found for host ${siteHost}, please correct your CMS configuration`) + "\n");
-            process.exitCode = 1;
-            return;
-        }
         process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Loaded website data, generating TypeScript code.\n`);
-        const siteDefinition = responseBody.data.SiteDefinition.items[0];
-        siteDefinition.domains = (siteDefinition.domains ?? []).map((d) => {
-            const def = {
-                name: d.name,
-                isPrimary: d.type == "Primary",
-                isEdit: d.type == "Edit"
-            };
-            if (d.forLocale?.code)
-                def.forLocale = d.forLocale?.code;
-            return def;
-        });
-        siteDefinition.locales = (siteDefinition.locales ?? []).map((c) => {
-            const loc = {
-                code: c.code,
-                slug: c.slug?.toLowerCase(),
-                graphLocale: c.code.replace("-", "_"),
-                isDefault: c.isDefault == true
-            };
-            return loc;
-        });
+        const [siteDefinition, cms_url] = channel.asDataObject();
         const code = [
             '/**',
             ' * This file has been automatically generated, do not update manually',
             ' *',
-            ' * Use yarn frontend-cli site-config to re-generate this file',
+            ' * Use yarn opti-graph config:create [file_path] to re-generate this file',
             ' */',
             'import { ChannelDefinition, type ChannelDefinitionData } from "@remkoj/optimizely-graph-client"',
             '',
             `const generated_data : ChannelDefinitionData = ${JSON.stringify(siteDefinition)};`,
             '',
-            `export const SiteConfig = new ChannelDefinition(generated_data, "${cgConfig.dxp_url}")`,
+            `export const SiteConfig = new ChannelDefinition(generated_data, "${cms_url}")`,
             'export default SiteConfig'
         ];
         const filePath = path__default.join(process.cwd(), targetFile);
@@ -366,45 +351,158 @@ const createSiteConfigModule = {
     aliases: [],
     describe: "Generate a static site configuration file",
 };
-function siteQuery(site_url) {
-    return {
-        query: `query GetSiteConfig($domain: String!) {
-            SiteDefinition (
-                where: {
-                    _or: [
-                        { Hosts: { Name: { eq: $domain }} }
-                    ]  
-                }
-            ) {
-              items {
-                    id: Id
-                    name: Name,
-                    domains: Hosts {
-                        name: Name
-                        type: Type
-                        forLocale: Language {
-                            code: Name
-                        }
-                    }
-                    locales:Languages {
-                        code:Name
-                        slug:UrlSegment
-                        isDefault:IsMasterLanguage
-                    }
-                    content: ContentRoots {
-                        startPage: StartPage {
-                            id:Id,
-                            guidValue:GuidValue
-                        }
-                    }
-                }
-            }
-        }`,
-        variables: JSON.stringify({ domain: site_url })
-    };
-}
 
-var commands = [publishToVercelModule$2, publishToVercelModule$1, publishToVercelModule, createSiteConfigModule];
+const GraphSourceListCommand = {
+    command: ['source:list', 'sl'],
+    handler: async (args) => {
+        const cgConfig = getArgsConfig(args);
+        if (!cgConfig.app_key || !cgConfig.secret)
+            throw new Error("Make sure both the Optimizely Graph App Key & Secret have been defined");
+        const adminApi = createAdminApi(cgConfig);
+        try {
+            const currentSources = (await adminApi.definitionV3.getContentV3SourceHandler());
+            const sources = new Table({
+                head: [chalk.yellow(chalk.bold("ID")), chalk.yellow(chalk.bold("Label")), chalk.yellow(chalk.bold("Languages"))],
+                colWidths: [10, 50, 50]
+            });
+            for (const sourceDetails of currentSources) {
+                sources.push([sourceDetails.id, sourceDetails.label, sourceDetails.languages.join(', ')]);
+            }
+            process.stdout.write(sources.toString() + "\n");
+            process.stdout.write(chalk.green(chalk.bold(figures.tick + " Done")) + "\n");
+        }
+        catch (e) {
+            if (isApiError(e)) {
+                process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an error: HTTP ${e.status}: ${e.statusText}`) + "\n");
+                if (args.verbose)
+                    console.error(chalk.redBright(JSON.stringify(e.body, undefined, 4)));
+            }
+            else {
+                process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an unknown error`) + "\n");
+                if (args.verbose)
+                    console.error(chalk.redBright(e));
+            }
+            process.exitCode = 1;
+            return;
+        }
+    },
+    aliases: [],
+    describe: "List all content sources in Optimizely Graph",
+};
+
+const GraphSourceClearCommand = {
+    command: ['source:clear [sourceId]', 'sc [sourceId]'],
+    handler: async (args) => {
+        const cgConfig = getArgsConfig(args);
+        if (!cgConfig.app_key || !cgConfig.secret)
+            throw new Error("Make sure both the Optimizely Graph App Key & Secret have been defined");
+        const sourceId = args.sourceId;
+        if (!sourceId) {
+            process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Missing source ID, invoke with --help for more details`) + "\n");
+            return process.exit(1);
+        }
+        const adminApi = createAdminApi(cgConfig);
+        try {
+            process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Loading content source: ${chalk.yellow(sourceId)}\n`);
+            const contentSource = (await adminApi.definitionV3.getContentV3SourceHandler(sourceId))[0];
+            if (!(contentSource && contentSource.id == sourceId)) {
+                throw new Error("An incorrect content source was returned by Optimizely Graph");
+            }
+            process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Removing all content from ${chalk.yellow(contentSource.label)} (Languages: ${chalk.yellow(contentSource.languages.join(', '))})\n`);
+            await adminApi.definitionV2.deleteContentV2DataHandler(sourceId, contentSource.languages);
+            process.stdout.write(chalk.green(chalk.bold(figures.tick + " Done")) + "\n");
+        }
+        catch (e) {
+            if (isApiError(e)) {
+                if (e.status == 404) {
+                    process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph Source with ID ${sourceId} does not exist`) + "\n");
+                }
+                else {
+                    process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an error: HTTP ${e.status}: ${e.statusText}`) + "\n");
+                }
+                if (args.verbose)
+                    console.error(chalk.redBright(JSON.stringify(e.body, undefined, 4)));
+            }
+            else {
+                process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an unknown error`) + "\n");
+                if (args.verbose)
+                    console.error(chalk.redBright(e));
+            }
+            process.exitCode = 1;
+            return;
+        }
+    },
+    aliases: [],
+    builder: (args) => {
+        args.positional('sourceId', { type: "string", describe: "The source to clear", demandOption: true });
+        return args;
+    },
+    describe: "Remove all data for the specified source",
+};
+
+const GraphSourceRemoveCommand = {
+    command: ['source:delete [sourceId]', 'sd [sourceId]'],
+    handler: async (args) => {
+        const cgConfig = getArgsConfig(args);
+        if (!cgConfig.app_key || !cgConfig.secret)
+            throw new Error("Make sure both the Optimizely Graph App Key & Secret have been defined");
+        const sourceId = args.sourceId;
+        if (!sourceId) {
+            process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Missing source ID, invoke with --help for more details`) + "\n");
+            return process.exit(1);
+        }
+        const adminApi = createAdminApi(cgConfig);
+        try {
+            process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Loading content source: ${chalk.yellow(sourceId)}\n`);
+            const contentSource = (await adminApi.definitionV3.getContentV3SourceHandler(sourceId))[0];
+            if (!(contentSource && contentSource.id == sourceId)) {
+                throw new Error("An incorrect content source was returned by Optimizely Graph");
+            }
+            process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Removing all content from ${chalk.yellow(contentSource.label)} (Languages: ${chalk.yellow(contentSource.languages.join(', '))})\n`);
+            await adminApi.definitionV2.deleteContentV2DataHandler(sourceId, contentSource.languages);
+            process.stdout.write(`${chalk.yellow(chalk.bold(figures.arrowRight))} Removing source ${chalk.yellow(contentSource.label)}\n`);
+            await adminApi.definitionV3.deleteContentV3SourceHandler(sourceId);
+            process.stdout.write(chalk.green(chalk.bold(figures.tick + " Done")) + "\n");
+        }
+        catch (e) {
+            if (isApiError(e)) {
+                if (e.status == 404) {
+                    process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph Source with ID ${sourceId} does not exist`) + "\n");
+                }
+                else {
+                    process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an error: HTTP ${e.status}: ${e.statusText}`) + "\n");
+                }
+                if (args.verbose)
+                    console.error(chalk.redBright(JSON.stringify(e.body, undefined, 4)));
+            }
+            else {
+                process.stderr.write(chalk.redBright(`${chalk.bold(figures.cross)} Optimizely Graph returned an unknown error`) + "\n");
+                if (args.verbose)
+                    console.error(chalk.redBright(e));
+            }
+            process.exitCode = 1;
+            return;
+        }
+    },
+    aliases: [],
+    builder: (args) => {
+        args.positional('sourceId', { type: "string", describe: "The source to clear", demandOption: true });
+        return args;
+    },
+    describe: "Remove all data for the specified source",
+};
+
+var SourceModules = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    GraphSourceClearCommand: GraphSourceClearCommand,
+    GraphSourceListCommand: GraphSourceListCommand,
+    GraphSourceRemoveCommand: GraphSourceRemoveCommand
+});
+
+const modules = [publishToVercelModule$2, publishToVercelModule$1, publishToVercelModule, createSiteConfigModule];
+for (const moduleName of Object.getOwnPropertyNames(SourceModules)) {
+    modules.push(SourceModules[moduleName]);
+}
 
 var APP;
 (function (APP) {
@@ -412,5 +510,5 @@ var APP;
     APP["Version"] = "1.0.3";
 })(APP || (APP = {}));
 const app = createCliApp(APP.Script, APP.Version);
-app.command(commands);
+app.command(modules);
 app.parse(process.argv.slice(2));

package/package.json

@@ -3,7 +3,7 @@
   "repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
   "author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
   "homepage": "https://github.com/remkoj/optimizely-dxp-clients",
-  "version": "1.0.3",
+  "version": "2.0.0-pre1",
   "license": "Apache-2.0",
   "packageManager": "yarn@4.1.1",
   "type": "module",
@@ -27,19 +27,19 @@
     "bundle": "yarn rollup --config rollup.config.js"
   },
   "devDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.3",
+    "@remkoj/optimizely-graph-client": "2.0.0-pre1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/pluginutils": "^5.1.0",
     "@types/crypto-js": "^4.2.2",
     "@types/glob": "^8.1.0",
-    "@types/node": "^20.12.4",
+    "@types/node": "^20.12.7",
     "@types/source-map-support": "^0.5.10",
     "@types/yargs": "^17.0.32",
-    "rollup": "^4.14.0",
+    "rollup": "^4.16.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "dependencies": {
     "chalk": "^5.3.0",
@@ -50,6 +50,7 @@
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
-    "@remkoj/optimizely-graph-client": "1.0.3"
-  }
+    "@remkoj/optimizely-graph-client": "2.0.0-pre1"
+  },
+  "stableVersion": "1.0.4"
 }