@speedkit/cli 2.4.1 → 2.5.0

package/README.md

@@ -74,7 +74,7 @@ $ npm install -g @speedkit/cli
 $ sk COMMAND
 running command...
 $ sk (--version)
-@speedkit/cli/2.4.1 linux-x64 node-v20.11.1
+@speedkit/cli/2.5.0 linux-x64 node-v20.11.1
 $ sk --help [COMMAND]
 USAGE
   $ sk COMMAND

package/dist/services/document-handler-runtime/document-handler-server.d.ts

@@ -26,6 +26,7 @@ export declare class DocumentHandlerServer {
     private createDataBaseMock;
     private createNodeVmContext;
     private createRequireMock;
+    private createFetchMock;
     private createProcessPartial;
     /**
      * Fetches and returns the latest dynamic fetcher from the code repository. If a new version is available online it is

package/dist/services/document-handler-runtime/document-handler-server.js

@@ -7,14 +7,9 @@ const required_file_not_found_error_1 = tslib_1.__importDefault(require("./error
 const database_mock_1 = tslib_1.__importDefault(require("./templates/database-mock"));
 const vm = tslib_1.__importStar(require("vm"));
 const vm_error_1 = require("../onboarding/error/vm-error");
+const path_1 = tslib_1.__importDefault(require("path"));
+const files_1 = require("../../models/files");
 // documentHandlerDependencies
-var parse5 = require('parse5');
-var parse5Htmlparser2TreeAdapter = require('parse5-htmlparser2-tree-adapter');
-var domSerializer = require('dom-serializer');
-var domhandler = require('domhandler');
-var domelementtype = require('domelementtype');
-var domutils = require('domutils');
-var cssSelect = require('css-select');
 var fetch = require('node-fetch');
 class DocumentHandlerServer {
     customerConfig;
@@ -84,11 +79,6 @@ class DocumentHandlerServer {
         return `${this.getContextVars()} ${docHandler} ${docHandlerConfig}`;
     }
     async getDocumentHandler() {
-        // todo use fetchRemoteFile from integration api
-        if (!this.files.hasFile(document_handler_runtime_context_1.LOCAL_DOCUMENT_HANDLER)) {
-            const response = await fetch(document_handler_runtime_context_1.LATEST_DOCUMENT_HANDLER_URL);
-            return await response.text();
-        }
         return this.files.getByName(document_handler_runtime_context_1.LOCAL_DOCUMENT_HANDLER).getContent();
     }
     async getDynamicFetcher() {
@@ -97,7 +87,7 @@ class DocumentHandlerServer {
             const response = await fetch(document_handler_runtime_context_1.LATEST_DYNAMIC_FETCHER_URL);
             return await this.bundleDynamicFetcher({ 'dynamic-fetcher': 'https://www.baqend.com/speed-kit/latest/' }, await response.text());
         }
-        return this.files.getByName(document_handler_runtime_context_1.LOCAL_DYNAMIC_FETCHER).getContent();
+        return this.files.getByName(files_1.INTEGRATION_FILES.CUSTOM.DYNAMIC_FETCHER).getContent();
     }
     async getDynamicFetcherConfig() {
         return this.files.getByName(document_handler_runtime_context_1.LOCAL_DYNAMIC_FETCHER_CONFIG).getContent();
@@ -145,7 +135,7 @@ class DocumentHandlerServer {
             process: this.createProcessPartial(),
             require: this.createRequireMock(),
             'URL': URL,
-            'fetch': fetch,
+            'fetch': this.createFetchMock(),
             'Buffer': Buffer,
         };
         if (this.verboseLevel) {
@@ -159,40 +149,31 @@ class DocumentHandlerServer {
                 return { baqend: { message: { RevalidateAssets: () => true } } };
             }
             if (module.includes('fetch')) {
-                return async (url, options) => {
-                    if (this.verboseLevel) {
-                        this.cli.writeWarning(`[documentHandler.fetch]: ${url}`);
-                    }
-                    return fetch(url, options);
-                };
-            }
-            if (module.includes('css-select')) {
-                return cssSelect;
-            }
-            if (module.includes('domutils')) {
-                return domutils;
-            }
-            if (module.includes('domelementtype')) {
-                return domelementtype;
-            }
-            if (module.includes('domhandler')) {
-                return domhandler;
-            }
-            if (module.includes('dom-serializer')) {
-                return domSerializer;
-            }
-            if (module.includes('parse5-htmlparser2-tree-adapter')) {
-                return parse5Htmlparser2TreeAdapter;
+                return this.createFetchMock();
             }
-            if (module.includes('parse5')) {
-                return parse5;
-            }
-            const moduleFileName = module.split('/')?.pop();
+            const fileExtension = path_1.default.extname(module);
+            const moduleFileName = path_1.default.basename(module, fileExtension);
             if (this.files.hasFile(moduleFileName)) {
                 const vmContext = { module: { exports: {} }, exports: {}, ...this.createNodeVmContext() };
                 vm.runInNewContext(this.files.getByName(moduleFileName).getContent(), vmContext);
                 return { ...vmContext.module.exports, ...vmContext.exports };
             }
+            try {
+                const outerModule = require(module);
+                return outerModule;
+            }
+            catch (error) {
+                this.cli.writeError(`[documentHandler] could not load module: ${module}`);
+                this.cli.writeError(error.message);
+            }
+        };
+    }
+    createFetchMock() {
+        return async (url, options) => {
+            if (this.verboseLevel) {
+                this.cli.writeWarning(`[documentHandler.fetch]: ${url}`);
+            }
+            return fetch(url, options);
         };
     }
     createProcessPartial() {
@@ -210,9 +191,6 @@ class DocumentHandlerServer {
      * @returns {Promise<string>} a Promise which resolves to the latest dynamic fetcher
      */
     async bundleDynamicFetcher(basePaths, dynamicFetcher) {
-        const IMPORT_PATHS = {
-            'dynamicFetcher': 'https://www.baqend.com/speed-kit/latest/',
-        };
         return this.bundler.bundle({
             basePaths: basePaths,
             entryPoints: { "dynamicFetcher.js": dynamicFetcher },

package/dist/services/onboarding/onboarding-model.d.ts

@@ -21,6 +21,7 @@ export declare class OnboardingContext {
     readonly DEFAULT_SW_PATH = "https://www.baqend.com/speed-kit/latest/sw.js";
     readonly DEFAULT_SNIPPET_PATH = "https://www.baqend.com/speed-kit/latest/snippet.js";
     readonly DEFAULT_DF_PATH = "https://www.baqend.com/speed-kit/latest/dynamic-fetcher.js";
+    readonly DEFAULT_DOCUMENT_HANDLER_PATH = "https://www.baqend.com/speed-kit-handler/latest/DocumentHandler.js";
     constructor(customerPath: string, configName: string, local: boolean, verboseLevel?: boolean);
 }
 export type awsCredentials = {

package/dist/services/onboarding/onboarding-model.js

@@ -43,6 +43,7 @@ class OnboardingContext {
     DEFAULT_SW_PATH = 'https://www.baqend.com/speed-kit/latest/sw.js';
     DEFAULT_SNIPPET_PATH = 'https://www.baqend.com/speed-kit/latest/snippet.js';
     DEFAULT_DF_PATH = 'https://www.baqend.com/speed-kit/latest/dynamic-fetcher.js';
+    DEFAULT_DOCUMENT_HANDLER_PATH = 'https://www.baqend.com/speed-kit-handler/latest/DocumentHandler.js';
     constructor(customerPath, configName, local, verboseLevel) {
         this.customerPath = customerPath;
         this.configName = configName;

package/dist/services/onboarding/onboarding-service-factory.js

@@ -128,6 +128,10 @@ class OnboardingServiceFactory {
                 name: files_1.INTEGRATION_FILES.CUSTOM.LOADER,
                 recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_SNIPPET_PATH, externalFileReader)
             },
+            {
+                name: files_1.INTEGRATION_FILES.CUSTOM.DOCUMENT_HANDLER,
+                recipe: new external_recipe_1.ExternalRecipe(this.context.DEFAULT_DOCUMENT_HANDLER_PATH, externalFileReader)
+            },
         ]);
     }
     getConfigApi(app) {

package/oclif.manifest.json

@@ -696,5 +696,5 @@
       ]
     }
   },
-  "version": "2.4.1"
+  "version": "2.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@speedkit/cli",
   "description": "Speed Kit CLI",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "author": {
     "name": "Baqend.com",
     "email": "info@baqend.com"