@cocreate/file-server 1.9.1 → 1.10.0

package/.github/workflows/automated.yml

@@ -58,8 +58,7 @@ jobs:
         run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
       - name: Install dependencies
         run: yarn install
-      - name: Build
-        run: yarn build
+
       - name: Set Environment Variables
         run: |
           echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.10.0](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.9.2...v1.10.0) (2023-09-07)
+
+
+### Features
+
+* defaultFile balanceFalse returned as response if organization balance false below 0 ([ecd86b1](https://github.com/CoCreate-app/CoCreate-file-server/commit/ecd86b1ee76007bbfffa88841072970804cc8e98))
+* Log inBound and outBound bandwidth ([2f79c40](https://github.com/CoCreate-app/CoCreate-file-server/commit/2f79c40e8429c6cb189964a51f4a275497bc352b))
+
+## [1.9.2](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.9.1...v1.9.2) (2023-08-21)
+
+
+### Bug Fixes
+
+* removed webpack.config and build step as no webpack.config exist ([f76e65f](https://github.com/CoCreate-app/CoCreate-file-server/commit/f76e65f84478ba6cd61eef0a2ca52d439b887738))
+
 ## [1.9.1](https://github.com/CoCreate-app/CoCreate-file-server/compare/v1.9.0...v1.9.1) (2023-08-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/file-server",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "A simple file-server component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "file-server",

package/src/index.js

@@ -42,7 +42,7 @@ class CoCreateFileSystem {
             return file.object[0].src
         }
 
-        let default403, default404, hostNotFound, signup
+        let default403, default404, hostNotFound, signup, balanceFalse
         defaultFiles('/403.html').then((file) => {
             default403 = file
         })
@@ -52,6 +52,9 @@ class CoCreateFileSystem {
         defaultFiles('/hostNotFound.html').then((file) => {
             hostNotFound = file
         })
+        defaultFiles('/balanceFalse').then((file) => {
+            balanceFalse = file
+        })
         defaultFiles('/superadmin/signup.html').then((file) => {
             signup = file
         })
@@ -76,22 +79,25 @@ class CoCreateFileSystem {
 
                     if (!org || !org.object || !org.object[0]) {
                         hostNotFound = hostNotFound || 'An organization could not be found using the host: ' + hostname + ' in platformDB: ' + process.env.organization_id
-                        res.writeHead(404, { 'Content-Type': 'text/html' });
-                        if (org.storage === false && org.error)
-                            res.setHeader('storage', 'false')
-                        else
-                            res.setHeader('storage', 'true')
-
+                        res.writeHead(404, { 'Content-Type': 'text/html', 'storage': organization.storage });
                         return res.end(hostNotFound);
                     } else {
                         organization = { _id: org.object[0]._id, storage: !!org.object[0].storage }
                         organizations.set(hostname, organization)
                     }
-
                 }
 
                 let organization_id = organization._id
+
+                let active = crud.wsManager.organizations.get(organization_id)
+                if (active === false) {
+                    balanceFalse = balanceFalse || 'This organizations account balance has fallen bellow 0: '
+                    res.writeHead(404, { 'Content-Type': 'text/html', 'Account-Balance': 'false', 'storage': organization.storage });
+                    return res.end(balanceFalse);
+                }
+
                 res.setHeader('organization', organization_id)
+                res.setHeader('storage', organization.storage);
                 res.setHeader('Access-Control-Allow-Origin', '*');
                 res.setHeader('Access-Control-Allow-Methods', '');
                 res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
@@ -126,13 +132,21 @@ class CoCreateFileSystem {
                     data.organization_id = process.env.organization_id
 
                 let file = await crud.send(data);
-                if (file.storage === false && file.error)
-                    res.setHeader('storage', 'false')
-                else
-                    res.setHeader('storage', 'true')
 
                 const fileContent = req.headers['File-Content']
                 if (fileContent && !pathname.startsWith('/superadmin')) {
+                    crud.wsManager.emit("setBandwidth", {
+                        type: 'in',
+                        data: fileContent,
+                        organization_id
+                    });
+
+                    crud.wsManager.emit("setBandwidth", {
+                        type: 'out',
+                        data: fileContent,
+                        organization_id
+                    });
+
                     res.writeHead(200, { 'Content-Type': req.headers['Content-Type'] });
                     return res.end(fileContent);
                 }
@@ -147,6 +161,13 @@ class CoCreateFileSystem {
                         pageNotFound = default404 || `${pathname} could not be found for ${organization_id}`
                     else
                         pageNotFound = pageNotFound.object[0].src
+
+                    crud.wsManager.emit("setBandwidth", {
+                        type: 'out',
+                        data: pageNotFound,
+                        organization_id
+                    });
+
                     res.writeHead(404, { 'Content-Type': 'text/html' });
                     return res.end(pageNotFound);
                 }
@@ -162,6 +183,13 @@ class CoCreateFileSystem {
                         pageForbidden = default403 || `${pathname} access not allowed for ${organization_id}`
                     else
                         pageForbidden = pageForbidden.object[0].src
+
+                    crud.wsManager.emit("setBandwidth", {
+                        type: 'out',
+                        data: pageForbidden,
+                        organization_id
+                    });
+
                     res.writeHead(403, { 'Content-Type': 'text/html' });
                     return res.end(pageForbidden);
                 }
@@ -192,6 +220,11 @@ class CoCreateFileSystem {
                     else
                         pageNotFound = pageNotFound.object[0].src
 
+                    crud.wsManager.emit("setBandwidth", {
+                        type: 'out',
+                        data: pageNotFound,
+                        organization_id
+                    });
 
                     res.writeHead(404, { 'Content-Type': 'text/html' });
                     return res.end(pageNotFound);
@@ -212,6 +245,12 @@ class CoCreateFileSystem {
                 if (file.modified)
                     res.setHeader('Last-Modified', file.modified.on);
 
+                crud.wsManager.emit("setBandwidth", {
+                    type: 'out',
+                    data: src,
+                    organization_id
+                });
+
                 res.writeHead(200, { 'Content-Type': contentType });
                 return res.end(src);
             } catch (error) {

package/webpack.config.js

@@ -1,90 +0,0 @@
-const path = require("path")
-const TerserPlugin = require("terser-webpack-plugin")
-const MiniCssExtractPlugin = require("mini-css-extract-plugin")
-const { CleanWebpackPlugin } = require("clean-webpack-plugin")
-
-module.exports = (env, argv) => {
-    let isProduction = false
-    if (argv.mode === 'production')
-        isProduction = true
-
-    const config = {
-        entry: {
-            "CoCreate-file-server": "./src/index.js",
-        },
-        output: {
-            path: path.resolve(__dirname, "dist"),
-            filename: isProduction ? "[name].min.js" : "[name].js",
-            libraryTarget: "umd",
-            libraryExport: "default",
-            library: ["CoCreate", "file-server"],
-            globalObject: "this",
-        },
-
-        plugins: [
-            new CleanWebpackPlugin(),
-            new MiniCssExtractPlugin({
-                filename: "[name].css",
-            }),
-        ],
-        // Default mode for Webpack is production.
-        // Depending on mode Webpack will apply different things
-        // on final bundle. For now we don't need production's JavaScript
-        // minifying and other thing so let's set mode to development
-        mode: isProduction ? "production" : "development",
-        module: {
-            rules: [
-                {
-                    test: /.js$/,
-                    exclude: /(node_modules)/,
-                    use: {
-                        loader: "babel-loader",
-                        options: {
-                            plugins: ["@babel/plugin-transform-modules-commonjs"],
-                        },
-                    },
-                },
-                {
-                    test: /.css$/i,
-                    use: [
-                        { loader: "style-loader", options: { injectType: "linkTag" } },
-                        "file-loader",
-                    ],
-                },
-            ],
-        },
-
-        // add source map
-        ...(isProduction ? {} : { devtool: "eval-source-map" }),
-
-        optimization: {
-            minimize: true,
-            minimizer: [
-                new TerserPlugin({
-                    extractComments: true,
-                    // cache: true,
-                    parallel: true,
-                    // sourceMap: true, // Must be set to true if using source-maps in production
-                    terserOptions: {
-                        // https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions
-                        // extractComments: 'all',
-                        compress: {
-                            drop_console: true,
-                        },
-                    },
-                }),
-            ],
-            splitChunks: {
-                chunks: "all",
-                minSize: 200,
-                // maxSize: 99999,
-                //minChunks: 1,
-
-                cacheGroups: {
-                    defaultVendors: false,
-                },
-            },
-        },
-    }
-    return config
-}