canopycms-cdk 0.0.58 → 0.0.59

package/lambda/asset-transform/dist/node_modules/sharp/src/utilities.cc

@@ -0,0 +1,289 @@
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
+
+#include <cmath>
+#include <cstdio>
+#include <string>
+
+#include <napi.h>
+#include <vips/vips8>
+#include <vips/vector.h>
+
+#include "./common.h"
+#include "./operations.h"
+#include "./utilities.h"
+
+/*
+  Get and set cache limits
+*/
+Napi::Value cache(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+
+  // Set memory limit
+  if (info[size_t(0)].IsNumber()) {
+    vips_cache_set_max_mem(static_cast<size_t>(info[size_t(0)].As<Napi::Number>().Uint32Value()) * 1048576);
+  }
+  // Set file limit
+  if (info[size_t(1)].IsNumber()) {
+    vips_cache_set_max_files(info[size_t(1)].As<Napi::Number>().Uint32Value());
+  }
+  // Set items limit
+  if (info[size_t(2)].IsNumber()) {
+    vips_cache_set_max(info[size_t(2)].As<Napi::Number>().Uint32Value());
+  }
+
+  // Get memory stats
+  Napi::Object memory = Napi::Object::New(env);
+  memory.Set("current", round(vips_tracked_get_mem() / 1048576));
+  memory.Set("high", round(vips_tracked_get_mem_highwater() / 1048576));
+  memory.Set("max", round(vips_cache_get_max_mem() / 1048576));
+  // Get file stats
+  Napi::Object files = Napi::Object::New(env);
+  files.Set("current", vips_tracked_get_files());
+  files.Set("max", vips_cache_get_max_files());
+
+  // Get item stats
+  Napi::Object items = Napi::Object::New(env);
+  items.Set("current", vips_cache_get_size());
+  items.Set("max", vips_cache_get_max());
+
+  Napi::Object cache = Napi::Object::New(env);
+  cache.Set("memory", memory);
+  cache.Set("files", files);
+  cache.Set("items", items);
+  return cache;
+}
+
+/*
+  Get and set size of thread pool
+*/
+Napi::Value concurrency(const Napi::CallbackInfo& info) {
+  // Set concurrency
+  if (info[size_t(0)].IsNumber()) {
+    vips_concurrency_set(info[size_t(0)].As<Napi::Number>().Int32Value());
+  }
+  // Get concurrency
+  return Napi::Number::New(info.Env(), vips_concurrency_get());
+}
+
+/*
+  Get internal counters (queued tasks, processing tasks)
+*/
+Napi::Value counters(const Napi::CallbackInfo& info) {
+  Napi::Object counters = Napi::Object::New(info.Env());
+  counters.Set("queue", static_cast<int>(sharp::counterQueue));
+  counters.Set("process", static_cast<int>(sharp::counterProcess));
+  return counters;
+}
+
+/*
+  Get and set use of SIMD vector unit instructions
+*/
+Napi::Value simd(const Napi::CallbackInfo& info) {
+  // Set state
+  if (info[size_t(0)].IsBoolean()) {
+    vips_vector_set_enabled(info[size_t(0)].As<Napi::Boolean>().Value());
+  }
+  // Get state
+  return Napi::Boolean::New(info.Env(), vips_vector_isenabled());
+}
+
+/*
+  Get libvips version
+*/
+Napi::Value libvipsVersion(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::Object version = Napi::Object::New(env);
+
+  char semver[9];
+  std::snprintf(semver, sizeof(semver), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
+  version.Set("semver", Napi::String::New(env, semver));
+#ifdef SHARP_USE_GLOBAL_LIBVIPS
+  version.Set("isGlobal", Napi::Boolean::New(env, true));
+#else
+  version.Set("isGlobal", Napi::Boolean::New(env, false));
+#endif
+#ifdef __EMSCRIPTEN__
+  version.Set("isWasm", Napi::Boolean::New(env, true));
+#else
+  version.Set("isWasm", Napi::Boolean::New(env, false));
+#endif
+  return version;
+}
+
+/*
+  Get available input/output file/buffer/stream formats
+*/
+Napi::Value format(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::Object format = Napi::Object::New(env);
+  for (std::string const f : {
+    "jpeg", "png", "webp", "tiff", "magick", "openslide", "dz",
+    "ppm", "fits", "gif", "svg", "heif", "pdf", "vips", "jp2k", "jxl", "rad", "dcraw"
+  }) {
+    std::string id = f == "jp2k" ? "jp2" : f;
+    // Input
+    const VipsObjectClass *oc = vips_class_find("VipsOperation", (f + "load").c_str());
+    Napi::Boolean hasInputFile = Napi::Boolean::New(env, oc);
+    Napi::Boolean hasInputBuffer =
+      Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "load_buffer").c_str()));
+    Napi::Object input = Napi::Object::New(env);
+    input.Set("file", hasInputFile);
+    input.Set("buffer", hasInputBuffer);
+    input.Set("stream", hasInputBuffer);
+    if (hasInputFile) {
+      const VipsForeignClass *fc = VIPS_FOREIGN_CLASS(oc);
+      if (fc->suffs) {
+        Napi::Array fileSuffix = Napi::Array::New(env);
+        const char **suffix = fc->suffs;
+        for (int i = 0; *suffix; i++, suffix++) {
+          fileSuffix.Set(i, Napi::String::New(env, *suffix));
+        }
+        input.Set("fileSuffix", fileSuffix);
+      }
+    }
+    // Output
+    Napi::Boolean hasOutputFile =
+      Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "save").c_str()));
+    Napi::Boolean hasOutputBuffer =
+      Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "save_buffer").c_str()));
+    Napi::Object output = Napi::Object::New(env);
+    output.Set("file", hasOutputFile);
+    output.Set("buffer", hasOutputBuffer);
+    output.Set("stream", hasOutputBuffer);
+    // Other attributes
+    Napi::Object container = Napi::Object::New(env);
+    container.Set("id", id);
+    container.Set("input", input);
+    container.Set("output", output);
+    // Add to set of formats
+    format.Set(id, container);
+  }
+
+  // Raw, uncompressed data
+  Napi::Boolean supported = Napi::Boolean::New(env, true);
+  Napi::Boolean unsupported = Napi::Boolean::New(env, false);
+  Napi::Object rawInput = Napi::Object::New(env);
+  rawInput.Set("file", unsupported);
+  rawInput.Set("buffer", supported);
+  rawInput.Set("stream", supported);
+  Napi::Object rawOutput = Napi::Object::New(env);
+  rawOutput.Set("file", unsupported);
+  rawOutput.Set("buffer", supported);
+  rawOutput.Set("stream", supported);
+  Napi::Object raw = Napi::Object::New(env);
+  raw.Set("id", "raw");
+  raw.Set("input", rawInput);
+  raw.Set("output", rawOutput);
+  format.Set("raw", raw);
+
+  return format;
+}
+
+/*
+  (Un)block libvips operations at runtime.
+*/
+void block(const Napi::CallbackInfo& info) {
+  Napi::Array ops = info[size_t(0)].As<Napi::Array>();
+  bool const state = info[size_t(1)].As<Napi::Boolean>().Value();
+  for (unsigned int i = 0; i < ops.Length(); i++) {
+    vips_operation_block_set(ops.Get(i).As<Napi::String>().Utf8Value().c_str(), state);
+  }
+}
+
+/*
+  Synchronous, internal-only method used by some of the functional tests.
+  Calculates the maximum colour distance using the DE2000 algorithm
+  between two images of the same dimensions and number of channels.
+*/
+Napi::Value _maxColourDistance(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+
+  // Open input files
+  VImage image1;
+  sharp::ImageType imageType1 = sharp::DetermineImageType(info[size_t(0)].As<Napi::String>().Utf8Value().data());
+  if (imageType1 != sharp::ImageType::UNKNOWN) {
+    try {
+      image1 = VImage::new_from_file(info[size_t(0)].As<Napi::String>().Utf8Value().c_str());
+    } catch (...) {
+      throw Napi::Error::New(env, "Input file 1 has corrupt header");
+    }
+  } else {
+    throw Napi::Error::New(env, "Input file 1 is of an unsupported image format");
+  }
+  VImage image2;
+  sharp::ImageType imageType2 = sharp::DetermineImageType(info[size_t(1)].As<Napi::String>().Utf8Value().data());
+  if (imageType2 != sharp::ImageType::UNKNOWN) {
+    try {
+      image2 = VImage::new_from_file(info[size_t(1)].As<Napi::String>().Utf8Value().c_str());
+    } catch (...) {
+      throw Napi::Error::New(env, "Input file 2 has corrupt header");
+    }
+  } else {
+    throw Napi::Error::New(env, "Input file 2 is of an unsupported image format");
+  }
+  // Ensure same number of channels
+  if (image1.bands() != image2.bands()) {
+    throw Napi::Error::New(env, "mismatchedBands");
+  }
+  // Ensure same dimensions
+  if (image1.width() != image2.width() || image1.height() != image2.height()) {
+    throw Napi::Error::New(env, "mismatchedDimensions");
+  }
+
+  double maxColourDistance;
+  try {
+    // Premultiply and remove alpha
+    if (image1.has_alpha()) {
+      image1 = image1.premultiply().extract_band(1, VImage::option()->set("n", image1.bands() - 1));
+    }
+    if (image2.has_alpha()) {
+      image2 = image2.premultiply().extract_band(1, VImage::option()->set("n", image2.bands() - 1));
+    }
+    // Calculate colour distance
+    maxColourDistance = image1.dE00(image2).max();
+  } catch (std::runtime_error const &err) {
+    throw Napi::Error::New(env, err.what());
+  }
+
+  // Clean up libvips' per-request data and threads
+  vips_error_clear();
+  vips_thread_shutdown();
+
+  return Napi::Number::New(env, maxColourDistance);
+}
+
+#if defined(__GNUC__)
+// mallctl will be resolved by the runtime linker when jemalloc is being used
+extern "C" {
+  int mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp, size_t newlen) __attribute__((weak));
+}
+Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  return Napi::Boolean::New(env, mallctl != nullptr);
+}
+#else
+Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  return Napi::Boolean::New(env, false);
+}
+#endif
+
+#if defined(__GNUC__) && defined(__x86_64__)
+// Are SSE 4.2 intrinsics available at runtime?
+Napi::Value _isUsingX64V2(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  unsigned int eax, ebx, ecx, edx;
+  __asm__ __volatile__("cpuid"
+    : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
+    : "a"(1));
+  return Napi::Boolean::New(env, (ecx & 1U << 20) != 0);
+}
+#else
+Napi::Value _isUsingX64V2(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  return Napi::Boolean::New(env, false);
+}
+#endif

package/lambda/asset-transform/dist/node_modules/sharp/src/utilities.h

@@ -0,0 +1,22 @@
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
+
+#ifndef SRC_UTILITIES_H_
+#define SRC_UTILITIES_H_
+
+#include <napi.h>
+
+Napi::Value cache(const Napi::CallbackInfo& info);
+Napi::Value concurrency(const Napi::CallbackInfo& info);
+Napi::Value counters(const Napi::CallbackInfo& info);
+Napi::Value simd(const Napi::CallbackInfo& info);
+Napi::Value libvipsVersion(const Napi::CallbackInfo& info);
+Napi::Value format(const Napi::CallbackInfo& info);
+void block(const Napi::CallbackInfo& info);
+Napi::Value _maxColourDistance(const Napi::CallbackInfo& info);
+Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info);
+Napi::Value _isUsingX64V2(const Napi::CallbackInfo& info);
+
+#endif  // SRC_UTILITIES_H_

package/lambda/asset-transform/dist/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "canopy-asset-transform-lambda",
+  "private": true,
+  "version": "0.0.0"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopycms-cdk",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "AWS CDK constructs and EC2 worker for CanopyCMS deployment",
   "license": "MIT",
   "repository": {
@@ -21,7 +21,8 @@
   "files": [
     "dist",
     "worker/dist",
-    "worker/canopy-worker.service"
+    "worker/canopy-worker.service",
+    "lambda/asset-transform/dist"
   ],
   "engines": {
     "node": ">=18"
@@ -52,8 +53,8 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.3",
     "vitest": "^4.1.0",
-    "canopycms": "0.0.58",
-    "canopycms-auth-clerk": "0.0.58"
+    "canopycms": "0.0.59",
+    "canopycms-auth-clerk": "0.0.59"
   },
   "scripts": {
     "build": "tsc",

package/worker/canopy-worker.service

@@ -1,6 +1,10 @@
 [Unit]
 Description=CanopyCMS Worker Daemon
 After=network.target
+# Never run against an unmounted workspace filesystem (matches the deployed
+# copy of this unit, which cms-service.ts user-data writes with an fstab
+# entry for /mnt/efs).
+RequiresMountsFor=/mnt/efs
 
 [Service]
 Type=simple
@@ -10,8 +14,18 @@ ExecStart=/usr/bin/node index.js
 Restart=always
 RestartSec=5
 TimeoutStartSec=300
-StandardOutput=journal
-StandardError=journal
+# File output, not journal: the CloudWatch agent cannot read journald,
+# so it tails this file instead (agent config lives in the cms-service.ts
+# user-data, which writes the deployed copy of this unit).
+# CAUTION: /var/log/canopy-worker must exist BEFORE first start. systemd
+# opens append: targets before it creates LogsDirectory= dirs
+# (systemd#27591), so without the pre-created dir the exec fails with
+# 209/STDOUT and Restart=always crash-loops forever. The deployed user-data
+# runs mkdir first; do the same if you install this unit by hand.
+# LogsDirectory= is kept for ownership management on subsequent starts.
+LogsDirectory=canopy-worker
+StandardOutput=append:/var/log/canopy-worker/worker.log
+StandardError=append:/var/log/canopy-worker/worker.log
 
 # Environment
 EnvironmentFile=/opt/canopy-worker/.env