@live-change/image-service 0.2.33 → 0.2.34

package/clientConfig.js

@@ -0,0 +1,24 @@
+const definition = require('./definition.js')
+
+const config = definition.config
+const uploadConfig = config.upload || {}
+
+const {
+  maxUploadSize = 10 * 1024 * 1024,
+  maxUploadWidth = 2048,
+  maxUploadHeight = 2048,
+  maxProcessableSize = 50 * 1024 * 1025,
+  maxProcessableWidth = 10000,
+  maxProcessableHeight = 10000,
+  maxProcessablePixels = 6000*6000
+} = uploadConfig
+
+definition.clientConfig = {
+  maxUploadSize,
+  maxUploadWidth,
+  maxUploadHeight,
+  maxProcessableSize,
+  maxProcessableWidth,
+  maxProcessableHeight,
+  maxProcessablePixels
+}

package/endpoint.js

@@ -1,8 +1,151 @@
 const app = require("@live-change/framework").app()
 const definition = require('./definition.js')
 
-const storageDir = `./storage/images/`
-const uploadsDir = `./uploads/`
+const { Image } = require('./image.js')
+
+const fs = require("fs")
+const path = require("path")
+const sharp = require('sharp')
+
+const config = definition.config
+
+const imagesPath = config.imagesPath || `./storage/images/`
+
+function normalizeFormat(f1) {
+  f1 = f1.toLowerCase().trim()
+  if(f1 == 'jpg') f1 = 'jpeg'
+  return f1
+}
+
+function isFormatsIdentical(f1, f2) {
+  return normalizeFormat(f1) == normalizeFormat(f2)
+}
+
+function fileExists(fn) {
+  return new Promise((resolve, reject) => {
+    fs.access(fn, fs.F_OK, (err) => {
+      resolve(!err)
+    })
+  })
+}
+
+function delay(ms) {
+  return new Promise((resolve, reject) => setTimeout(resolve, ms))
+}
+async function getImageMetadata(picture, version) {
+  for(let t = 0; t < 5; t++) {
+    const metadata = await Image.get(picture)
+    console.log("MD", metadata)
+    if(metadata.original && metadata[version]) return metadata
+    await delay(200 * Math.pow(2, t))
+  }
+  return null
+}
+
+function sanitizeImageId(id) {
+  return id.replace(/[^a-zA-Z0-9\[\]@\.-]/g,"_")
+}
+
+async function handleImageGet(req, res, params) {
+  const { picture, version } = params
+  const metadata = await getImageMetadata(picture, version)
+  console.log("PIC METADATA", picture, version, "=>", metadata)
+  if(!metadata) {
+    res.status(404)
+    res.send("Picture not found")
+    return
+  }
+  const imagePrefix = imagesPath + sanitizeImageId(picture) + '/' + version.replace(/[^a-zA-Z0-9-]/g,"_")
+  const sourceFilePath = path.resolve(imagePrefix + '.' + metadata.original.extension)
+  console.log("SOURCE PIC PATH", sourceFilePath)
+  if(!(await fileExists(sourceFilePath))) {
+    res.status(404)
+    console.error("PICTURE FILE NOT FOUND", sourceFilePath)
+    res.send("Picture file not found")
+    return
+  }
+
+  const kernel = "lanczos3"
+
+  switch(params.type) {
+    case "auto": {
+      if(params.format && !isFormatsIdentical(params.format, metadata.original.extension)) {
+        console.log("CONVERTING PICTURE!", metadata.original.extension, params.format)
+        const normalized = normalizeFormat(params.format)
+        const convertedFilePath = path.resolve(imagePrefix + '.' + normalized)
+        if(!(await fileExists(convertedFilePath))) {
+          await sharp(sourceFilePath).toFile(convertedFilePath)
+        }
+        res.sendFile(convertedFilePath)
+      } else res.sendFile(sourceFilePath)
+    } break;
+    case "width": {
+      const width = +params.width
+      if(!(width > 0)) {
+        res.status(400)
+        res.send("Bad parameter value")
+        return
+      }
+      //if(width > metadata.original.width) return res.sendFile(sourceFilePath)
+      const normalized = normalizeFormat(params.format || metadata.original.extension)
+      const convertedFilePath = path.resolve(imagePrefix + `-width-${width}.${normalized}`)
+      if(!(await fileExists(convertedFilePath))) {
+        await sharp(sourceFilePath)
+            .resize({
+              width,
+              kernel
+            })
+            .toFile(convertedFilePath)
+      }
+      res.sendFile(convertedFilePath)
+    } break;
+    case "height": {
+      const height = +params.height
+      if(!(height > 0)) {
+        res.status(400)
+        res.send("Bad parameter value")
+        return
+      }
+      //if(height > metadata.original.height) return res.sendFile(sourceFilePath)
+      const normalized = normalizeFormat(params.format || metadata.original.extension)
+      const convertedFilePath = path.resolve(imagePrefix + `-height-${height}.${normalized}`)
+      if(!(await fileExists(convertedFilePath))) {
+        await sharp(sourceFilePath)
+            .resize({
+              height,
+              kernel
+            })
+            .toFile(convertedFilePath)
+      }
+      res.sendFile(convertedFilePath)
+    } break;
+    case "rect": {
+      const width = +params.width
+      const height = +params.height
+      if(!(height > 0 && width>0)) {
+        res.status(400)
+        res.send("Bad parameter value")
+        return
+      }
+      //if(height > metadata.original.height) return res.sendFile(sourceFilePath)
+      //if(width > metadata.original.width) return res.sendFile(sourceFilePath)
+      const normalized = normalizeFormat(params.format || metadata.original.extension)
+      const convertedFilePath = path.resolve(imagePrefix + `-rect-${width}-${height}.${normalized}`)
+      if(!(await fileExists(convertedFilePath))) {
+        await sharp(sourceFilePath)
+            .resize({
+              width, height,
+              fit: sharp.fit.cover,
+              position: sharp.strategy.attention,
+              kernel
+            })
+            .toFile(convertedFilePath)
+      }
+      res.sendFile(convertedFilePath)
+    }
+  }
+}
+
 
 const express = require("express")
 
@@ -10,39 +153,30 @@ definition.endpoint({
   name: 'image',
   create() {
     const expressApp = express()
-    expressApp.get('/:image/:version/width-:width.:format', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "width"
-    }))
-    expressApp.get('/:image/:version/width-:width', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "width"
-    }))
-    expressApp.get('/:image/:version/height-:height.:format', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "height"
-    }))
-    expressApp.get('/:image/:version/height-:height', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "height"
-    }))
-    expressApp.get('/:image/:version/rect-:width-:height.:format', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "rect"
-    }))
-    expressApp.get('/:image/:version/rect-:width-:height', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "rect"
-    }))
-    expressApp.get('/:image/:version.:format', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "auto"
-    }))
-    expressApp.get('/:image/:version', (req, res) => handleImageGet(req, res, {
-      ...req.params,
-      type: "auto"
-    }))
-    
+    expressApp.get('/:image/:version/width-:width.:format',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "width" })
+    )
+    expressApp.get('/:image/:version/width-:width',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "width" })
+    )
+    expressApp.get('/:image/:version/height-:height.:format',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "height" })
+    )
+    expressApp.get('/:image/:version/height-:height',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "height" })
+    )
+    expressApp.get('/:image/:version/rect-:width-:height.:format',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "rect" })
+    )
+    expressApp.get('/:image/:version/rect-:width-:height',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "rect" })
+    )
+    expressApp.get('/:image/:version.:format',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "auto" })
+    )
+    expressApp.get('/:image/:version',
+        (req, res) => handleImageGet(req, res, { ...req.params, type: "auto" })
+    )
     return expressApp
   }
 })

package/fsUtils.js

@@ -1,3 +1,4 @@
+const fs = require('fs')
 
 function move(from, to) {
   return new Promise((resolve,reject) => {

package/image.js

@@ -1,8 +1,9 @@
 const app = require("@live-change/framework").app()
 const definition = require('./definition.js')
+const config = definition.config
 
-const storageDir = `./storage/images/`
-const uploadsDir = `./uploads/`
+const imagesPath = config.imagesPath || `./storage/images/`
+const uploadsPath = config.uploadsPath || `./storage/uploads/`
 
 const Image = definition.model({
   name: "Image",
@@ -48,6 +49,9 @@ const download = require('download')
 definition.action({
   name: "createEmptyImage",
   properties: {
+    image: {
+      type: Image
+    },
     name: {
       type: String,
       validation: ['nonEmpty']
@@ -66,10 +70,16 @@ definition.action({
     }
   },
   /// TODO: accessControl
-  async execute({ name, purpose, owner, ownerType }, { client, service }, emit) {
-    const image = app.generateUid()
+  async execute({ image, name, purpose, owner, ownerType }, { client, service }, emit) {
+    if(!image) {
+      image = app.generateUid()
+    } else {
+      // TODO: check id source session
+      const existing = await Image.get(image)
+      if (existing) throw 'already_exists'
+    }
 
-    const dir = `${storageDir}${image}`
+    const dir = `${imagesPath}${image}`
 
     emit({
       type: "ownerOwnedImageCreated",
@@ -93,6 +103,8 @@ definition.action({
   }
 })
 
+const Upload = definition.foreignModel('upload', 'Upload')
+
 definition.action({
   name: "uploadImage",
   properties: {
@@ -104,26 +116,26 @@ definition.action({
       properties: {
         width: { type: Number },
         height: { type: Number },
-        uploadId: { type: String }
+        upload: { type: Upload }
       }
     }
   },
   /// TODO: accessControl!
   waitForEvents: true,
   async execute({ image, original }, { client, service }, emit) {
-    const upload = await app.dao.get(['database', 'tableObject', app.databaseName, 'uploads', original.uploadId])
-    if(!upload) throw new Error("upload_not_found")
-    if(upload.state!='done') throw new Error("upload_not_done")
+    const uploadRow = await Upload.get(original.upload)
+    if(!uploadRow) throw new Error("upload_not_found")
+    if(uploadRow.state!='done') throw new Error("upload_not_done")
 
-    let extension = upload.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
+    let extension = uploadRow.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
     if(extension == 'jpg') extension = "jpeg"
-    const dir = `${storageDir}${image}`
+    const dir = `${imagesPath}${image}`
 
     emit({
       type: "ownerOwnedImageUpdated",
       image,
       data: {
-        fileName: upload.fileName,
+        fileName: uploadRow.fileName,
         original: {
           width: original.width,
           height: original.height,
@@ -133,8 +145,11 @@ definition.action({
       }
     })
 
-    await move(`${uploadsDir}${upload.id}`, `${dir}/original.${extension}`)
-    await app.dao.request(['database', 'delete'], app.databaseName, 'uploads', upload.id)
+    await move(`${uploadsPath}${uploadRow.id}`, `${dir}/original.${extension}`)
+    await app.trigger({
+      type: 'uploadUsed',
+      upload: uploadRow.id
+    })
 
     return image
   }
@@ -143,6 +158,9 @@ definition.action({
 definition.action({
   name: "createImage",
   properties: {
+    image: {
+      type: Image
+    },
     name: {
       type: String,
       validation: ['nonEmpty']
@@ -152,7 +170,7 @@ definition.action({
       properties: {
         width: { type: Number },
         height: { type: Number },
-        uploadId: { type: String }
+        upload: { type: Upload }
       }
     },
     purpose: {
@@ -170,16 +188,21 @@ definition.action({
   },
   /// TODO: accessControl!
   waitForEvents: true,
-  async execute({ name, original, purpose }, { client, service }, emit) {
-    const image = app.generateUid()
-    const upload = await app.dao.get(['database', 'tableObject', app.databaseName, 'uploads', original.uploadId])
-
-    if(!upload) throw new Error("upload_not_found")
-    if(upload.state!='done') throw new Error("upload_not_done")
+  async execute({ image, name, original, purpose, owner, ownerType }, { client, service }, emit) {
+    if(!image) {
+      image = app.generateUid()
+    } else {
+      // TODO: check id source session
+      const existing = await Image.get(image)
+      if (existing) throw 'already_exists'
+    }
+    const uploadRow = await Upload.get(original.upload)
+    if(!uploadRow) throw new Error("upload_not_found")
+    if(uploadRow.state!='done') throw new Error("upload_not_done")
 
-    let extension = upload.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
+    let extension = uploadRow.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
     if(extension == 'jpg') extension = "jpeg"
-    const dir = `${storageDir}${image}`
+    const dir = `${imagesPath}${image}`
 
     emit({
       type: "ownerOwnedImageCreated",
@@ -190,7 +213,7 @@ definition.action({
       data: {
         name,
         purpose,
-        fileName: upload.fileName,
+        fileName: uploadRow.fileName,
         original: {
           width: original.width,
           height: original.height,
@@ -204,8 +227,12 @@ definition.action({
     await mkdir(dir)
     await mkdir(`${dir}/originalCache`)
     await mkdir(`${dir}/cropCache`)
-    await move(`${uploadsDir}${upload.id}`, `${dir}/original.${extension}`)
-    await app.dao.request(['database', 'delete'], app.databaseName, 'uploads', upload.id)
+    await move(`${uploadsPath}${uploadRow.id}`, `${dir}/original.${extension}`)
+
+    await app.trigger({
+      type: 'uploadUsed',
+      upload: uploadRow.id
+    })
 
     return image
   }
@@ -228,29 +255,29 @@ definition.action({
         orientation: {type: Number}
       }
     },
-    uploadId: {type: String}
+    upload: {type: Upload}
   },
   /// TODO: accessControl!
   waitForEvents: true,
-  async execute({ image, crop, uploadId }, {client, service}, emit) {
+  async execute({ image, crop, upload }, {client, service}, emit) {
     const imageRow = await Image.get(image)
     if(!imageRow) throw new Error("not_found")
 
-    const upload = await app.dao.get(['database', 'tableObject', app.databaseName, 'uploads', uploadId])
+    const uploadRow = await Upload.get(upload)
 
-    console.log("UPLOAD CROP", upload)
+    console.log("UPLOAD CROP", uploadRow)
 
-    if(!upload) throw new Error("upload_not_found")
-    if(upload.state != 'done') throw new Error("upload_not_done")
+    if(!uploadRow) throw new Error("upload_not_found")
+    if(uploadRow.state != 'done') throw new Error("upload_not_done")
 
     console.log("CURRENT IMAGE ROW", image, imageRow)
     if(!imageRow.crop) { // first crop
-      const dir = `${storageDir}${image}`
-      let extension = upload.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
+      const dir = `${imagesPath}${image}`
+      let extension = uploadRow.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
       if(extension == 'jpg') extension = "jpeg"
 
-      await move(`${uploadsDir}${upload.id}`, `${dir}/crop.${extension}`)
-      await app.dao.request(['database', 'delete'], app.databaseName, 'uploads', upload.id)
+      await move(`${uploadsPath}${uploadRow.id}`, `${dir}/crop.${extension}`)
+      await app.dao.request(['database', 'delete'], app.databaseName, 'uploads', uploadRow.id)
 
       emit({
         type: "ownerOwnedImageUpdated",
@@ -264,8 +291,8 @@ definition.action({
     } else { // next crop - need to copy image
       const newImage = app.generateUid()
 
-      const dir = `${storageDir}${image}`
-      const newDir = `${storageDir}${newImage}`
+      const dir = `${imagesPath}${image}`
+      const newDir = `${imagesPath}${newImage}`
 
       await mkdir(newDir)
       await mkdir(`${newDir}/originalCache`)
@@ -273,11 +300,15 @@ definition.action({
       await move(`${dir}/original.${imageRow.original.extension}`,
           `${newDir}/original.${imageRow.original.extension}`)
 
-      let extension = upload.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
+      let extension = uploadRow.fileName.match(/\.([A-Z0-9]+)$/i)[1].toLowerCase()
       if(extension == 'jpg') extension = "jpeg"
 
-      await move(`../../storage/uploads/${upload.id}`, `${newDir}/crop.${extension}`)
-      await app.dao.request(['database', 'delete'], app.databaseName, 'uploads', upload.id)
+      await move(`../../storage/uploads/${uploadRow.id}`, `${newDir}/crop.${extension}`)
+
+      await app.trigger({
+        type: 'uploadUsed',
+        upload: uploadRow.id
+      })
 
       const { owner, ownerType } = imageRow
 
@@ -290,7 +321,7 @@ definition.action({
         data: {
           name: imageRow.name,
           purpose: imageRow.purpose,
-          fileName: upload.fileName,
+          fileName: uploadRow.fileName,
           original: imageRow.original,
           crop
         }
@@ -333,8 +364,8 @@ definition.trigger({
   async execute({ name, purpose, url, cropped, owner, ownerType }, { service, client }, emit) {
     const image = app.generateUid()
 
-    const downloadPath = `${uploadsDir}download_${image}`
-    await download(url, uploadsDir, { filename: `download_${image}` })
+    const downloadPath = `${uploadsPath}download_${image}`
+    await download(url, uploadsPath, { filename: `download_${image}` })
 
     const metadata = await sharp(downloadPath).metadata()
 
@@ -376,7 +407,7 @@ definition.trigger({
       data
     })
 
-    const dir = `${storageDir}/${image}`
+    const dir = `${imagesPath}/${image}`
 
     await mkdir(dir)
     await mkdir(`${dir}/originalCache`)

package/index.js

@@ -2,6 +2,8 @@ const app = require("@live-change/framework").app()
 
 const definition = require('./definition.js')
 
+require('./clientConfig.js')
 require('./image.js')
+require('./endpoint.js')
 
 module.exports = definition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/image-service",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,9 @@
   "dependencies": {
     "@live-change/framework": "0.6.5",
     "@live-change/relations-plugin": "0.6.5",
-    "pluralize": "8.0.0"
+    "download": "^8.0.0",
+    "pluralize": "8.0.0",
+    "sharp": "^0.30.6"
   },
-  "gitHead": "8918e5113c031c3d9766df32283de7fb6421e0be"
+  "gitHead": "45f52d6c7586d0eaa51b3205c6635a33e32eef6b"
 }