@pronto-tools-and-more/pronto 12.33.0 → 12.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "12.33.0",
+  "version": "12.35.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -17,23 +17,24 @@
     "@lvce-editor/ipc": "^13.7.0",
     "@lvce-editor/json-rpc": "^5.4.0",
     "@lvce-editor/verror": "^1.6.0",
-    "@pronto-tools-and-more/file-watcher": "12.33.0",
-    "@pronto-tools-and-more/files": "12.33.0",
-    "@pronto-tools-and-more/network-process": "12.33.0",
-    "@pronto-tools-and-more/sass-compiler": "12.33.0",
-    "@pronto-tools-and-more/components-renderer": "12.33.0",
-    "@pronto-tools-and-more/components": "12.33.0",
-    "@pronto-tools-and-more/schema-process": "12.33.0",
-    "@pronto-tools-and-more/diff-process": "12.33.0",
-    "@pronto-tools-and-more/type-checker": "12.33.0",
-    "@pronto-tools-and-more/custom-js-functions": "12.33.0",
+    "@pronto-tools-and-more/api": "12.35.0",
+    "@pronto-tools-and-more/components-renderer": "12.35.0",
+    "@pronto-tools-and-more/components": "12.35.0",
+    "@pronto-tools-and-more/custom-js-functions": "12.35.0",
+    "@pronto-tools-and-more/diff-process": "12.35.0",
+    "@pronto-tools-and-more/file-watcher": "12.35.0",
+    "@pronto-tools-and-more/files": "12.35.0",
+    "@pronto-tools-and-more/network-process": "12.35.0",
+    "@pronto-tools-and-more/sass-compiler": "12.35.0",
+    "@pronto-tools-and-more/schema-process": "12.35.0",
+    "@pronto-tools-and-more/type-checker": "12.35.0",
     "execa": "^9.5.2",
     "express": "^4.21.2"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
     "@types/node": "^22.10.0",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.5.14",
     "jest": "^29.7.0"
   }
 }

package/src/parts/ApiProcess/ApiProcess.js

@@ -0,0 +1,32 @@
+import * as JsonRpc from "../JsonRpc/JsonRpc.js";
+import * as LaunchApiProcess from "../LaunchApiProcess/LaunchApiProcess.js";
+
+const state = {
+  /**
+   * @type {any}
+   */
+  ipc: undefined,
+};
+
+const getOrCreate = () => {
+  if (!state.ipc) {
+    state.ipc = LaunchApiProcess.launchApiProcess();
+  }
+  return state.ipc;
+};
+
+export const invoke = async (method, ...params) => {
+  const ipc = await getOrCreate();
+  return JsonRpc.invoke(ipc, method, ...params);
+};
+
+export const invokeAndTransfer = async (method, ...params) => {
+  const ipc = await getOrCreate();
+  return JsonRpc.invokeAndTransfer(ipc, method, ...params);
+};
+
+export const dispose = async () => {
+  const ipc = await getOrCreate();
+  ipc.dispose();
+  state.ipc = undefined;
+};

package/src/parts/ApiProcessPath/ApiProcessPath.js

@@ -0,0 +1,7 @@
+import * as Path from "node:path";
+import * as Root from "../Root/Root.js";
+import * as ResolveBin from "../ResolveBin/ResolveBin.js";
+
+export const apiProcessPath =
+  ResolveBin.resolveBin("@pronto-tools-and-more/api") ||
+  Path.join(Root.root, "packages", "pronto-api", "src", "main.js");

package/src/parts/HandleApi/HandleApi.js

@@ -1,53 +1,35 @@
-import * as HandleApiArticle from "../HandleApiArticle/HandleApiArticle.js";
-import * as HandleApiAuthors from "../HandleApiAuthors/HandleApiAuthors.js";
-import * as HandleCategories from "../HandleApiCategories/HandleApiCategories.js";
-import * as HandleApiCollection from "../HandleApiCollection/HandleApiCollection.js";
-import * as HandleApiCollections from "../HandleApiCollections/HandleApiCollections.js";
-import * as HandleApiDossier from "../HandleApiDossier/HandleApiDossier.js";
-import * as HandleDossiers from "../HandleApiDossiers/HandleApiDossiers.js";
-import * as HandleApiIndex from "../HandleApiIndex/HandleApiIndex.js";
-import * as HandleApiIssues from "../HandleApiIssues/HandleApiIssues.js";
-import * as HandleApiMenus from "../HandleApiMenus/HandleApiMenus.js";
+import * as ApiProcess from "../ApiProcess/ApiProcess.js";
+
+const getHandleMessage = (request) => {
+  return {
+    headers: request.headers,
+    method: request.method,
+    path: request.path,
+    url: request.url,
+    httpVersionMajor: request.httpVersionMajor,
+    httpVersionMinor: request.httpVersionMinor,
+    query: request.query,
+  };
+};
 
 export const handleApi =
   ({ appId, apiUrl }) =>
-  (req, res) => {
-    if (req.url === "/") {
-      return HandleApiIndex.handleIndex(req, res);
-    }
-    if (req.url === "/categories") {
-      return HandleCategories.handleCategories({ appId, apiUrl })(req, res);
-    }
-    if (req.url === "/dossiers") {
-      return HandleDossiers.handleDossiers({ appId, apiUrl })(req, res);
-    }
-    if (req.url.startsWith("/dossiers")) {
-      return HandleApiDossier.handleDossier({ appId, apiUrl })(req, res);
-    }
-    if (req.url === "/issues") {
-      return HandleApiIssues.handleIssues({ appId, apiUrl })(req, res);
-    }
-    if (req.url === "/authors") {
-      return HandleApiAuthors.handleAuthors({ appId, apiUrl })(req, res);
-    }
-    if (req.url.startsWith("/articles")) {
-      return HandleApiArticle.handleApiArticle({ appId, apiUrl })(req, res);
-    }
-    if (req.url === "/collections" || req.url === "/collections/") {
-      return HandleApiCollections.handleApiCollections({ appId, apiUrl })(
-        req,
-        res
-      );
-    }
-    if (req.url.startsWith("/collections")) {
-      return HandleApiCollection.handleApiCollection({ appId, apiUrl })(
-        req,
-        res
-      );
-    }
-    if (req.url === "/menus" || req.url === "/menus/") {
-      return HandleApiMenus.handleMenus({ apiUrl, appId })(req, res);
+  async (req, res) => {
+    try {
+      const handleMessage = getHandleMessage(req);
+      const response = await ApiProcess.invoke("Api.handleApi", {
+        appId,
+        apiUrl,
+        req: handleMessage,
+      });
+      res.statusCode = response.status;
+      res.headers = response.headers;
+      res.end(response.body);
+    } catch (error) {
+      console.error(`[api] ${error}`);
+      if (res && !res.headersSent) {
+        res.status = 500;
+        res.end(`${error}`);
+      }
     }
-    res.statusCode = 404;
-    return res.end("not found");
   };

package/src/parts/LaunchApiProcess/LaunchApiProcess.js

@@ -0,0 +1,15 @@
+import * as ApiProcessPath from "../ApiProcessPath/ApiProcessPath.js";
+import * as HandleIpc from "../HandleIpc/HandleIpc.js";
+import * as IpcParent from "../IpcParent/IpcParent.js";
+import * as IpcParentType from "../IpcParentType/IpcParentType.js";
+
+export const launchApiProcess = async () => {
+  const ipc = await IpcParent.create({
+    method: IpcParentType.NodeForkedProcess,
+    path: ApiProcessPath.apiProcessPath,
+  });
+  HandleIpc.handleIpc(ipc);
+  // @ts-ignore
+  ipc._rawIpc.unref();
+  return ipc;
+};

package/src/parts/Version/Version.js

@@ -1 +1 @@
-export const version = '12.33.0'
+export const version = '12.35.0'

package/src/parts/GetPostIds/GetPostIds.js

@@ -1,41 +0,0 @@
-import * as GraphQlQueryPathSegments from "../GraphQlQueryPathSegments/GraphQlQueryPathSegments.js";
-
-export const getPostIds = async ({ appId, apiUrl, slug }) => {
-  const realBottom = {
-    ...GraphQlQueryPathSegments.bottom,
-    appInfo: {
-      ...GraphQlQueryPathSegments.bottom.appInfo,
-      appId,
-    },
-    pathSegments: [slug],
-  };
-  const response = await fetch(apiUrl, {
-    method: "POST",
-    headers: {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      operationName: GraphQlQueryPathSegments.queryName,
-      query: GraphQlQueryPathSegments.top,
-      variables: realBottom,
-    }),
-  });
-  const result = await response.json();
-  // @ts-ignore
-  if (result && result.error) {
-    // @ts-ignore
-    throw new Error(`api error: ${result.error}`);
-  }
-  // @ts-ignore
-  const realData = result.data.catalog.lookupPathSegments
-    .flatMap((item) => item.matches)
-    .map((match) => {
-      const { __typename, ...rest } = match;
-      return rest;
-    })
-    .map((match) => {
-      return match.id;
-    });
-  return realData;
-};

package/src/parts/GraphQlQueryAuthors/GraphQlQueryAuthors.js

@@ -1,66 +0,0 @@
-export const top = `query CatalogContentsQuery($appInfo: AppInfo!, $deviceInfo: DeviceInfo!, $authorization: Authorization!, $first: Int, $after: String, ) {
-  catalog(
-    appInfo: $appInfo
-    deviceInfo: $deviceInfo
-    authorization: $authorization
-  ) {
-    taxonomiesConnection(first: $first, after: $after, filter:{type:{
-      value:"author"
-    }}) {
-      pageInfo {
-        hasNextPage
-        __typename
-      }
-      totalCount
-      edges {
-        cursor
-        node {
-          name
-          properties {
-            key
-            value
-          }
-          thumbnails {
-            properties {
-              key
-              value
-            }
-          }
-
-          __typename
-        }
-        __typename
-      }
-      __typename
-    }
-    __typename
-  }
-}`;
-
-export const bottom = {
-  appInfo: {
-    appId: "",
-    appVersion: "1.0-SNAPSHOT",
-    preview: true,
-  },
-  deviceInfo: {
-    deviceId: "editor-preview",
-    deviceModel: "web",
-    locale: "de_DE",
-    deviceOs: "web",
-    platform: "WEB",
-  },
-  comparators: [
-    {
-      publicationDate: {
-        direction: "DESC",
-      },
-    },
-  ],
-  first: 99999,
-  includeBlocks: false,
-  includeHtml: false,
-  includeResources: false,
-  includeBundledContent: false,
-  authorization: {},
-};

package/src/parts/GraphQlQueryCategories/GraphQlQueryCategories.js

@@ -1,66 +0,0 @@
-export const top = `query CatalogContentsQuery($appInfo: AppInfo!, $deviceInfo: DeviceInfo!, $authorization: Authorization!, $first: Int, $after: String, ) {
-  catalog(
-    appInfo: $appInfo
-    deviceInfo: $deviceInfo
-    authorization: $authorization
-  ) {
-    taxonomiesConnection(first: $first, after: $after, filter:{type:{
-      value:"category"
-    }}) {
-      pageInfo {
-        hasNextPage
-        __typename
-      }
-      totalCount
-      edges {
-        cursor
-        node {
-          name
-          properties {
-            key
-            value
-          }
-          thumbnails {
-            properties {
-              key
-              value
-            }
-          }
-
-          __typename
-        }
-        __typename
-      }
-      __typename
-    }
-    __typename
-  }
-}`;
-
-export const bottom = {
-  appInfo: {
-    appId: "",
-    appVersion: "1.0-SNAPSHOT",
-    preview: true,
-  },
-  deviceInfo: {
-    deviceId: "editor-preview",
-    deviceModel: "web",
-    locale: "de_DE",
-    deviceOs: "web",
-    platform: "WEB",
-  },
-  comparators: [
-    {
-      publicationDate: {
-        direction: "DESC",
-      },
-    },
-  ],
-  first: 99999,
-  includeBlocks: false,
-  includeHtml: false,
-  includeResources: false,
-  includeBundledContent: false,
-  authorization: {},
-};

package/src/parts/GraphQlQueryCollection/GraphQlQueryCollection.js

@@ -1,227 +0,0 @@
-export const top = `query CatalogCollections($appInfo: AppInfo!, $deviceInfo: DeviceInfo!, $authorization: Authorization!, $filter: CollectionFilter, $sort: [CollectionComparator!], $first: Int, $after: String, $includeElements: Boolean!, $elementsFirst: Int, $elementsAfter: String, $includeBundledContent: Boolean!, $includeResources: Boolean!, $includeBlocks: Boolean!, $includeHtml: Boolean!, $includeContentSeoMetadata: Boolean!, $propertyFilter: PropertyFilter) {
-  catalog(
-    appInfo: $appInfo
-    deviceInfo: $deviceInfo
-    authorization: $authorization
-  ) {
-    collectionsConnection(
-      filter: $filter
-      sort: $sort
-      first: $first
-      after: $after
-    ) {
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-      edges {
-        node {
-          id
-          name
-          properties {
-            key
-            value
-          }
-          elementsConnection(first: $elementsFirst, after: $elementsAfter) @include(if: $includeElements) {
-            pageInfo {
-              hasNextPage
-              endCursor
-            }
-            edges {
-              node {
-                __typename
-                ... on ContentElement {
-                  id
-                  sortIndex
-                  content {
-                    ...ContentFragment
-                    ...IssueFragment
-                    ...PostFragment
-                    ...BundleFragment
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment ContentFragment on Content {
-  __typename
-  id
-  version
-  name
-  description
-  index
-  alias
-  externalId
-  publicationDate
-  unpublishDate
-  lastModified
-  access
-  productId
-  purchaseData {
-    purchased
-    purchasedBy
-  }
-  publication {
-    id
-  }
-  properties(filter: $propertyFilter) {
-    key
-    value
-  }
-  seoMetadata @include(if: $includeContentSeoMetadata) {
-    key
-    value
-  }
-  thumbnails {
-    kind
-    url
-    properties {
-      key
-      value
-    }
-  }
-  categories
-  tags
-}
-
-fragment IssueFragment on Issue {
-  contentLength
-  numberOfPages
-  previewContentLength
-  resources @include(if: $includeResources) {
-    id
-    url
-    type
-    contentLength
-    properties {
-      key
-      value
-      type
-    }
-  }
-}
-
-fragment PostFragment on Post {
-  postType
-  bundleId
-  bundles {
-    id
-    bundleType
-  }
-  taxonomies {
-    ...TaxonomySummaryFragment
-  }
-  authors {
-    name
-    email
-  }
-  bundleId
-  content @include(if: $includeBlocks) {
-    ...ContentBlockFragment
-  }
-  previewContentBlocks @include(if: $includeBlocks) {
-    ...ContentBlockFragment
-  }
-  contentHtml @include(if: $includeHtml)
-  previewContentHtml @include(if: $includeHtml)
-  resources @include(if: $includeResources) {
-    id
-    url
-    type
-    contentLength
-    properties {
-      key
-      value
-      type
-    }
-  }
-}
-
-fragment ContentBlockFragment on ContentBlock {
-  id
-  type
-  parentId
-  children
-  sequence
-  html
-  level
-  properties {
-    key
-    value
-    type
-  }
-}
-
-fragment BundleFragment on Bundle {
-  bundleType
-  taxonomies {
-    ...TaxonomySummaryFragment
-  }
-  authors {
-    name
-    email
-  }
-  contents @include(if: $includeBundledContent) {
-    id
-    content {
-      ...ContentFragment
-      ...PostFragment
-    }
-  }
-}
-
-fragment TaxonomySummaryFragment on Taxonomy {
-  id
-  internalId
-  name
-  type
-  parentId
-  seoMetadata @include(if: $includeContentSeoMetadata) {
-    key
-    value
-  }
-  properties {
-    key
-    value
-  }
-}`;
-
-export const bottom = {
-  filter: {
-    name: {
-      value: "",
-    },
-  },
-  first: 24,
-  includeElements: true,
-  elementsFirst: 100,
-  includeBlocks: false,
-  includeHtml: false,
-  includeResources: false,
-  includeBundledContent: false,
-  includeContentSeoMetadata: false,
-  appInfo: {
-    appId: "",
-    appVersion: "1.0-SNAPSHOT",
-    preview: true,
-  },
-  deviceInfo: {
-    deviceId: "editor-preview",
-    deviceModel: "web",
-    locale: "de_DE",
-    smallestScreenWidthDp: 0,
-    deviceOs: "web",
-    platform: "WEB",
-  },
-  authorization: {
-    subscriptionCodes: [],
-  },
-};
-
-export const queryName = "CatalogCollections";