anear-js-api 2.0.1 → 2.1.1

package/lib/ci/registerAppVersion.js

@@ -8,6 +8,9 @@ async function registerAppVersionFromCi({
   gitSha = process.env.GITHUB_SHA,
   imageUri = process.env.IMAGE_URI,
   assetManifestHash = process.env.ASSET_MANIFEST_HASH,
+  imageAssetsUrl = process.env.IMAGE_ASSETS_URL,
+  fontAssetsUrl = process.env.FONT_ASSETS_URL,
+  cssUrl = process.env.CSS_URL,
   status = 'building'
 } = {}) {
   if (!appId || !version) {
@@ -19,7 +22,10 @@ async function registerAppVersionFromCi({
     status,
     git_sha: gitSha,
     image_uri: imageUri,
-    asset_manifest_hash: assetManifestHash
+    asset_manifest_hash: assetManifestHash,
+    image_assets_url: imageAssetsUrl,
+    font_assets_url: fontAssetsUrl,
+    css_url: cssUrl
   })
 
   return data

package/lib/state_machines/AnearCoreServiceMachine.js

@@ -61,6 +61,8 @@ const C = require('../utils/Constants')
 const CreateVersionedEventChannelNameTemplate = (appId, appVersion) => `anear:${appId}:v:${normalizeVersionToken(appVersion)}:e`
 const DefaultTemplatesRootDir = "./views"
 const SkipRuntimeAssetSync = process.env.ANEARAPP_SKIP_RUNTIME_ASSET_SYNC === 'true'
+const FallbackImageAssetsUrl = process.env.ANEARAPP_IMAGE_ASSETS_URL || null
+const FallbackFontAssetsUrl = process.env.ANEARAPP_FONT_ASSETS_URL || null
 
 // Process-wide signal handling.
 // We install exactly once per process to avoid duplicate handlers in reconnect/restart scenarios.
@@ -161,13 +163,27 @@ const AnearCoreServiceMachineConfig = appId => ({
         {
           guard: 'runtimeAssetSyncDisabled',
           actions: () => logger.info('[ACSM] Runtime asset sync disabled; assuming CI has already published assets'),
-          target: 'loadAndCompilePugTemplates'
+          target: 'resolveVersionAssetUrls'
         },
         {
           target: 'uploadNewImageAssets'
         }
       ]
     },
+    resolveVersionAssetUrls: {
+      invoke: {
+        src: 'fetchLatestAppVersionAssets',
+        input: ({ context }) => ({ appId: context.appId }),
+        onDone: {
+          actions: assign({
+            imageAssetsUrl: ({ event }) => event.output.imageAssetsUrl,
+            fontAssetsUrl: ({ event }) => event.output.fontAssetsUrl
+          }),
+          target: 'loadAndCompilePugTemplates'
+        },
+        onError: '#failure'
+      }
+    },
     uploadNewImageAssets: {
       invoke: {
         src: 'uploadNewImageAssets',
@@ -255,6 +271,19 @@ const AnearCoreServiceMachineFunctions = {
     // v5 pattern: async "services" become Promise Actors via `fromPromise`.
     // The invoked actor receives `input` from the invoking state's `invoke.input`.
     fetchAppData: fromPromise(({ input }) => AnearApi.getApp(input.appId)),
+    fetchLatestAppVersionAssets: fromPromise(async ({ input }) => {
+      const latestVersion = await AnearApi.getLatestAppVersion(input.appId)
+      const attrs = latestVersion?.attributes || {}
+      const imageAssetsUrl = attrs['image-assets-url'] || FallbackImageAssetsUrl
+      const fontAssetsUrl = attrs['font-assets-url'] || FallbackFontAssetsUrl
+
+      if (!imageAssetsUrl) {
+        throw new Error('[ACSM] Missing image-assets-url for latest app version; set app_version image_assets_url in ANAPI or ANEARAPP_IMAGE_ASSETS_URL env var')
+      }
+
+      logger.info(`[ACSM] Using pre-published version assets image_base=${imageAssetsUrl}`)
+      return { imageAssetsUrl, fontAssetsUrl }
+    }),
     uploadNewImageAssets: fromPromise(({ input }) => {
       const uploader = new ImageAssetsUploader(C.ImagesDirPath, input.appId)
       return uploader.uploadAssets()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anear-js-api",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Javascript Developer API for Anear Apps",
   "main": "lib/index.js",
   "scripts": {