Arc 10

.gitignore

@@ -1,3 +1,4 @@
+buckets/
 node_modules/
 sample-app/public/static.json
 sample-app/**/package-lock.json

package.json

@@ -2,7 +2,7 @@
   "name": "arc-plugin-s3-image-bucket",
   "version": "1.1.2",
   "description": "Architect (arc.codes) serverless framework plugin that creates an S3 bucket that users can upload to directly, with optional Lambda triggers",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "eslint",
     "test:unit": "jasmine --config=test/jasmine.json",
@@ -26,16 +26,15 @@
   },
   "homepage": "https://github.com/filmaj/arc-plugin-s3-image-bucket/issues",
   "devDependencies": {
-    "@architect/eslint-config": "^1.0.0",
-    "@architect/inventory": "^1.3.3",
-    "@architect/package": "^6.2.1",
-    "eslint": "^7.19.0",
-    "fs-extra": "^9.1.0",
-    "jasmine": "^3.6.4"
+    "@architect/eslint-config": "^2.0.1",
+    "@architect/inventory": "^3.0.0-RC.7",
+    "eslint": "^8.8.0",
+    "fs-extra": "^10.0.0",
+    "jasmine": "^4.0.2"
   },
   "dependencies": {
-    "@architect/utils": "^2.0.5",
-    "s3rver": "^3.6.1"
+    "@architect/utils": "^3.0.4",
+    "s3rver": "^3.7.1"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config",

sample-app/app.arc

@@ -20,3 +20,4 @@ LambdaOnImageCreate
 
 @plugins
 arc-plugin-s3-image-bucket
+  src ../

sample-app/package.json

@@ -4,9 +4,11 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "@architect/architect": "^8.6.0"
+    "@architect/architect": "^10.0.0-RC.3",
+    "@architect/functions": "^5.0.0-RC.1",
+    "file-type": "^17.1.1",
+    "gm": "^1.23.1"
   },
-  "devDependencies": {},
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

sample-app/src/http/get-index/index.js

@@ -4,7 +4,9 @@ let form = require('./form');
 
 async function getIndex (req) {
   let services = await arc.services();
-  const redirect = `http${process.env.NODE_ENV === 'testing' ? '' : 's'}://${req.headers.Host || req.headers.host}/success`;
+  let local = process.env.ARC_ENV === 'testing';
+  let prot = local ? 'http' : 'https';
+  const redirect = `${prot}://${req.headers.Host || req.headers.host}/success`;
   const { name, accessKey, secretKey } = services['arc-plugin-s3-image-bucket'];
   const region = process.env.AWS_REGION;
   const upload = form({ redirect, bucket: name, accessKey, secretKey, region });

sample-app/src/http/get-index/s3.js

@@ -8,7 +8,7 @@ const crypto = require('crypto');
 // * secretKey
 module.exports = function s3Credentials (config, params) {
   return {
-    endpoint: process.env.NODE_ENV === 'testing' ? `http://localhost:4569/${config.bucket}` : `https://${config.bucket}.s3.amazonaws.com`,
+    endpoint: process.env.ARC_ENV === 'testing' ? `http://localhost:4569/${config.bucket}` : `https://${config.bucket}.s3.amazonaws.com`,
     params: s3Params(config, params)
   };
 };

sample-app/src/image-bucket/OnImageCreate/thumbnail.js

@@ -1,8 +1,8 @@
-let aws = require('aws-sdk')
-let gm = require('gm')
+let aws = require('aws-sdk');
+let gm = require('gm');
 
-const MAX_WIDTH = 100
-const MAX_HEIGHT = 100
+const MAX_WIDTH = 100;
+const MAX_HEIGHT = 100;
 
 /**
  * if ext is jpg or png write thumb/filename.(png|jpg)
@@ -14,27 +14,27 @@ const MAX_HEIGHT = 100
  * @param {Buffer} body
  * @returns {Promise}
  */
-module.exports = function thumbnail({bucket, key, mime, ext, body, s3}) {
+module.exports = function thumbnail ({ bucket, key, mime, ext, body, s3 }) {
 
   // early exit if this isn't an image
-  let thumb = ext === 'jpg' || ext === 'png'
+  let thumb = ext === 'jpg' || ext === 'png';
   if (!thumb)
-    return Promise.resolve()
+    return Promise.resolve();
 
   // if it is an image resize it
-  return new Promise(function argh(res, rej) {
-    let mg = gm.subClass({imageMagick: true})
-    mg(body).size(function size(err, size) {
-      if (err) rej(err)
+  return new Promise(function argh (res, rej) {
+    let mg = gm.subClass({ imageMagick: true });
+    mg(body).size(function size (err, size) {
+      if (err) rej(err);
       else {
 
-        let scaling = Math.min(MAX_WIDTH / size.width, MAX_HEIGHT / size.height)
-        let width  = scaling * size.width
-        let height = scaling * size.height
+        let scaling = Math.min(MAX_WIDTH / size.width, MAX_HEIGHT / size.height);
+        let width  = scaling * size.width;
+        let height = scaling * size.height;
 
         // resize the file buffer
-        this.resize(width, height).toBuffer(ext, function resize(err, buffer) {
-          if (err) rej(err)
+        this.resize(width, height).toBuffer(ext, function resize (err, buffer) {
+          if (err) rej(err);
           else {
 
             // write the buffer to s3 under thumb/
@@ -43,10 +43,10 @@ module.exports = function thumbnail({bucket, key, mime, ext, body, s3}) {
               Bucket: bucket,
               Key: key.replace('raw/', 'thumb/') + '.' + ext,
               Body: buffer
-            }).promise().then(res).catch(rej)
+            }).promise().then(res).catch(rej);
           }
-        })
+        });
       }
-    })
-  })
-}
+    });
+  });
+};

sample-app/src/shared/image-bucket-s3.js

@@ -2,7 +2,7 @@ const aws = require('aws-sdk');
 
 module.exports = async function (arc) {
   let config;
-  if (process.env.NODE_ENV === 'testing') {
+  if (process.env.ARC_ENV === 'testing') {
     let services = await arc.services();
     const { accessKey, secretKey } = services['arc-plugin-s3-image-bucket'];
     config = {