@paralect/hive 0.0.2 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/cli/helpers/axiosAuth.js +12 -0
  2. package/cli/helpers/downloadDirectory.js +46 -0
  3. package/cli/helpers/execCommand.js +48 -0
  4. package/cli/helpers/isAuthorized.js +41 -0
  5. package/cli/helpers/isProjectInit.js +71 -0
  6. package/cli/helpers/mergeDirs.js +71 -0
  7. package/cli/hive.js +158 -43
  8. package/package.json +8 -3
  9. package/starter/.babelrc +3 -0
  10. package/starter/.dockerignore +1 -0
  11. package/starter/Dockerfile +16 -7
  12. package/starter/bin/deploy.sh +5 -0
  13. package/starter/deploy/api/Chart.yaml +6 -0
  14. package/starter/deploy/api/staging.yaml +3 -0
  15. package/starter/deploy/api/templates/deployment.yaml +44 -0
  16. package/starter/deploy/api/templates/ingress.yaml +26 -0
  17. package/starter/deploy/api/templates/service.yaml +14 -0
  18. package/starter/deploy/script/Dockerfile +39 -0
  19. package/starter/deploy/script/package-lock.json +1499 -0
  20. package/starter/deploy/script/package.json +12 -0
  21. package/starter/deploy/script/src/config.js +48 -0
  22. package/starter/deploy/script/src/index.js +106 -0
  23. package/starter/deploy/script/src/util.js +19 -0
  24. package/starter/package-lock.json +3363 -139
  25. package/starter/package.json +9 -1
  26. package/starter/src/app-config/index.js +10 -0
  27. package/starter/src/db.js +13 -3
  28. package/starter/src/emails/MyEmailComponent.jsx +16 -0
  29. package/starter/src/emails/compiled/MyEmailComponent.js +17 -0
  30. package/starter/src/helpers/getResourceEndpoints.js +15 -13
  31. package/starter/src/helpers/getResources.js +2 -1
  32. package/starter/src/helpers/getSchemas.js +3 -0
  33. package/starter/src/middlewares/shouldExist.js +24 -4
  34. package/starter/src/resources/health/endpoints/get.js +7 -0
  35. package/starter/src/resources/users/endpoints/getCurrentUser.js +4 -1
  36. package/starter/src/resources/users/endpoints/getUserProfile.js +3 -2
  37. package/starter/src/resources/users/methods/ensureUserCreated.js +7 -7
  38. package/starter/src/resources/users/users.schema.js +1 -1
  39. package/starter/src/routes/index.js +1 -1
  40. package/starter/src/services/emailService.js +15 -0
  41. package/starter/bin/init-project.sh +0 -22
@@ -17,6 +17,7 @@
17
17
  },
18
18
  "scripts": {
19
19
  "build-assets": "mjml ./src/assets/emails/*.mjml -o ./src/assets/emails/dist/",
20
+ "build-emails": "babel src/emails --out-dir src/emails/compiled",
20
21
  "dev": "nodemon --watch src src/app.js",
21
22
  "init-project": "./bin/init-project.sh",
22
23
  "start": "node src/app.js",
@@ -31,6 +32,8 @@
31
32
  "@koa/multer": "3.0.0",
32
33
  "@koa/router": "10.1.1",
33
34
  "@paralect/node-mongo": "2.1.1",
35
+ "@react-email/components": "^0.0.20",
36
+ "@react-email/render": "^0.0.16",
34
37
  "@sendgrid/mail": "7.6.1",
35
38
  "@socket.io/redis-adapter": "7.1.0",
36
39
  "@socket.io/redis-emitter": "4.1.1",
@@ -40,7 +43,7 @@
40
43
  "dotenv": "16.0.0",
41
44
  "eslint-config-prettier": "8.5.0",
42
45
  "handlebars": "4.7.7",
43
- "joi": "17.6.0",
46
+ "joi": "^17.13.3",
44
47
  "koa": "2.13.4",
45
48
  "koa-bodyparser": "4.3.0",
46
49
  "koa-helmet": "6.1.0",
@@ -54,6 +57,7 @@
54
57
  "moment-duration-format": "2.3.2",
55
58
  "multer": "1.4.4",
56
59
  "node-schedule": "2.1.0",
60
+ "nodemailer": "^6.9.14",
57
61
  "nodemon": "2.0.15",
58
62
  "prettier": "2.6.2",
59
63
  "psl": "1.8.0",
@@ -66,6 +70,10 @@
66
70
  "winston": "3.6.0"
67
71
  },
68
72
  "devDependencies": {
73
+ "@babel/cli": "^7.24.7",
74
+ "@babel/core": "^7.24.7",
75
+ "@babel/preset-env": "^7.24.7",
76
+ "@babel/preset-react": "^7.24.7",
69
77
  "eslint": "8.9.0",
70
78
  "eslint-config-airbnb-base": "15.0.0",
71
79
  "eslint-plugin-import": "2.25.4",
@@ -33,6 +33,16 @@ const config = {
33
33
  url: process.env.REDIS_URI,
34
34
  },
35
35
 
36
+ smtp: {
37
+ host: process.env.SMTP_SERVER,
38
+ port: process.env.SMTP_PORT,
39
+ secure: true,
40
+ auth: {
41
+ user: process.env.SMTP_USER,
42
+ pass: process.env.SMTP_KEY,
43
+ },
44
+ },
45
+
36
46
  ...appConfig,
37
47
 
38
48
  assert(configKey) {
package/starter/src/db.js CHANGED
@@ -17,10 +17,20 @@ db.init = async () => {
17
17
  _.each(
18
18
  schemaPaths,
19
19
  ({ file: schemaFile, resourceName, name: schemaName }) => {
20
- const schema = require(schemaFile);
21
- db.schemas[schemaName] = schema;
20
+ let schema = require(schemaFile);
21
+
22
+ if (process.env.HIVE_SRC) {
23
+ let extendSchemaPath = `${process.env.HIVE_SRC}/resources/${resourceName}/${schemaName}.extends.schema.js`;
24
+
25
+ if (fs.existsSync(extendSchemaPath)) {
26
+ let extendsSchema = require(extendSchemaPath);
27
+
28
+ schema = schema.append(extendsSchema);
29
+ console.log('schema', schema);
30
+ }
31
+ }
22
32
 
23
- console.log("Registering service", resourceName);
33
+ db.schemas[schemaName] = schema;
24
34
 
25
35
  db.services[schemaName] = db.createService(`${resourceName}`, {
26
36
  validate: (obj) => schema.validate(obj, { allowUnknown: true }),
@@ -0,0 +1,16 @@
1
+ const React = require('react');
2
+ const { Html, Head, Body, Container, Heading, Text } = require('@react-email/components');
3
+
4
+ const MyEmailComponent = ({ name }) => (
5
+ <Html>
6
+ <Head />
7
+ <Body>
8
+ <Container>
9
+ <Heading>Hello, {name}!</Heading>
10
+ <Text>This is a test email using @react-email and Express.</Text>
11
+ </Container>
12
+ </Body>
13
+ </Html>
14
+ );
15
+
16
+ module.exports = { MyEmailComponent };
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+
3
+ var React = require('react');
4
+ var _require = require('@react-email/components'),
5
+ Html = _require.Html,
6
+ Head = _require.Head,
7
+ Body = _require.Body,
8
+ Container = _require.Container,
9
+ Heading = _require.Heading,
10
+ Text = _require.Text;
11
+ var MyEmailComponent = function MyEmailComponent(_ref) {
12
+ var name = _ref.name;
13
+ return /*#__PURE__*/React.createElement(Html, null, /*#__PURE__*/React.createElement(Head, null), /*#__PURE__*/React.createElement(Body, null, /*#__PURE__*/React.createElement(Container, null, /*#__PURE__*/React.createElement(Heading, null, "Hello, ", name, "!"), /*#__PURE__*/React.createElement(Text, null, "This is a test email using @react-email and Express."))));
14
+ };
15
+ module.exports = {
16
+ MyEmailComponent: MyEmailComponent
17
+ };
@@ -6,21 +6,23 @@ const {
6
6
  } = fs;
7
7
 
8
8
  module.exports = async (resourceName) => {
9
- console.log('get resource endpoint', resourceName);
10
- let isHiveEndpoint;
9
+ let endpointFiles = [];
11
10
 
12
- if (fs.existsSync(`${__dirname}/../resources/${resourceName}/endpoints`) || (process.env.HIVE_SRC && (isHiveEndpoint = true) && fs.existsSync(`${process.env.HIVE_SRC}/resources/${resourceName}/endpoints`)) ) {
13
- const endpointFiles = await readdir(
14
- isHiveEndpoint ?
15
- `${process.env.HIVE_SRC}/resources/${resourceName}/endpoints` :
11
+ if (fs.existsSync(`${process.env.HIVE_SRC}/resources/${resourceName}/endpoints`)) {
12
+ endpointFiles = [...endpointFiles, ...(await readdir(
13
+ `${process.env.HIVE_SRC}/resources/${resourceName}/endpoints`
14
+ )).map( f => ({ name: f, isHiveEndpoint: true}))];
15
+ }
16
+
17
+ if (fs.existsSync(`${__dirname}/../resources/${resourceName}/endpoints`)) {
18
+ endpointFiles = [...endpointFiles, ...(await readdir(
16
19
  `${__dirname}/../resources/${resourceName}/endpoints`
17
- );
18
-
19
- return endpointFiles.map((f) => ({
20
- file: isHiveEndpoint ? `${process.env.HIVE_SRC}/resources/${resourceName}/endpoints/${f}`: `${__dirname}/../resources/${resourceName}/endpoints/${f}`,
21
- name: _.last(f.split("/")).replace(".js", ""),
22
- }));
20
+ )).map( f => ({ name: f }))];
23
21
  }
24
22
 
25
- return [];
23
+ return endpointFiles.map(({ name, isHiveEndpoint }) => ({
24
+ file: isHiveEndpoint ? `${process.env.HIVE_SRC}/resources/${resourceName}/endpoints/${name}`: `${__dirname}/../resources/${resourceName}/endpoints/${name}`,
25
+ name: _.last(name.split("/")).replace(".js", ""),
26
+ }));
27
+
26
28
  };
@@ -1,3 +1,4 @@
1
+ const _ = require("lodash");
1
2
  const path = require("path");
2
3
  const fs = require("fs");
3
4
 
@@ -19,7 +20,7 @@ module.exports = async () => {
19
20
  let hiveResourcesDirPath = `${process.env.HIVE_SRC}/resources`;
20
21
 
21
22
  if (fs.existsSync(hiveResourcesDirPath)) {
22
- resourceDirs = [...resourceDirs, ...((await getDirectories(hiveResourcesDirPath)).map(r => ({ dirName: r.dirName, isHive: true })))]
23
+ resourceDirs = _.uniqBy([...resourceDirs, ...((await getDirectories(hiveResourcesDirPath)).map(r => ({ dirName: r.dirName, isHive: true })))], r => r.dirName);
23
24
  }
24
25
  }
25
26
 
@@ -3,6 +3,7 @@ const {
3
3
  } = require("fs");
4
4
  const getResources = require("./getResources");
5
5
 
6
+
6
7
  module.exports = async () => {
7
8
  const resources = await getResources();
8
9
 
@@ -12,11 +13,13 @@ module.exports = async () => {
12
13
  resources.map(async ({ dir: resourceDir, name: resourceName }) => {
13
14
  const resourceSchemas = (await readdir(resourceDir))
14
15
  .filter((f) => f.includes("schema.js"))
16
+ .filter((f) => !f.includes("extends.schema"))
15
17
  .map((f) => ({
16
18
  file: `${resourceDir}/${f}`,
17
19
  resourceName,
18
20
  name: f.replace(".schema.js", ""),
19
21
  }));
22
+
20
23
  schemas.push(...resourceSchemas);
21
24
  })
22
25
  );
@@ -1,12 +1,32 @@
1
- const db = require("db");
1
+ const db = require('db');
2
+
3
+ function singularize(word) {
4
+ const endings = {
5
+ ves: 'fe',
6
+ ies: 'y',
7
+ i: 'us',
8
+ zes: 'ze',
9
+ ses: 's',
10
+ es: 'e',
11
+ s: '',
12
+ };
13
+ return word.replace(
14
+ new RegExp(`(${Object.keys(endings).join('|')})$`),
15
+ (r) => endings[r]
16
+ );
17
+ }
2
18
 
3
19
  module.exports = (
4
20
  resourceName,
5
- { criteria = (ctx) => ({ _id: ctx.params[`${resourceName}Id`] }) } = {}
21
+ {
22
+ criteria = (ctx) => ({ _id: ctx.params[`${singularize(resourceName)}Id`] }),
23
+ ctxName = resourceName,
24
+ } = {}
6
25
  ) => {
7
26
  return async (ctx, next) => {
8
27
  const doc = await db.services[resourceName].findOne(criteria(ctx));
9
- ctx.state[resourceName] = doc;
28
+ ctx.state[ctxName] = doc;
29
+ ctx.state[singularize(resourceName)] = doc;
10
30
 
11
31
  if (!doc) {
12
32
  ctx.throw(404, { message: `${resourceName} not found` });
@@ -14,4 +34,4 @@ module.exports = (
14
34
  await next();
15
35
  }
16
36
  };
17
- };
37
+ };
@@ -1,4 +1,11 @@
1
+ const { render } = require('@react-email/render');
2
+ const { MyEmailComponent } = require('emails/compiled/MyEmailComponent');
3
+ const React = require('react');
4
+
1
5
  const handler = (ctx) => {
6
+ const emailHtml = render(React.createElement(MyEmailComponent, { name: 'test' }));
7
+
8
+ ctx.body = emailHtml;
2
9
  ctx.status = 200;
3
10
  };
4
11
 
@@ -1,9 +1,12 @@
1
+ const Joi = require("joi");
2
+ const userService = require('db').services.users;
3
+
1
4
  module.exports.handler = async (ctx) => {
2
5
  const user = await userService.findOne({ _id: ctx.state.user._id });
3
6
  ctx.body = user;
4
7
  };
5
8
 
6
- const Joi = require("joi");
9
+ module.exports.middlewares = [require('middlewares/isAuthorized')];
7
10
 
8
11
  module.exports.requestSchema = Joi.object({});
9
12
 
@@ -1,11 +1,12 @@
1
+ const Joi = require("joi");
2
+ const userService = require('db').services.users;
3
+
1
4
  module.exports.handler = async (ctx) => {
2
5
  const { userId } = ctx.params;
3
6
  const user = await userService.findOne({ _id: userId });
4
7
  ctx.body = user;
5
8
  };
6
9
 
7
- const Joi = require("joi");
8
-
9
10
  module.exports.requestSchema = Joi.object({
10
11
  userId: Joi.string().required(),
11
12
  });
@@ -3,15 +3,15 @@ const slug = require('slug');
3
3
 
4
4
  const userService = require('db').services.users;
5
5
 
6
- const formatUsername = ({ username, fullName }) => {
6
+ const formatUsername = ({ username, fullName, email }) => {
7
7
  return (
8
8
  username ||
9
- slug(`${fullName.split(' ')[0]} ${fullName.split(' ')[1] || ''}`, '.')
9
+ fullName ? slug(`${fullName.split(' ')[0]} ${fullName.split(' ')[1] || ''}`, '.') : email?.split('@')[0]
10
10
  );
11
11
  };
12
12
 
13
13
  const createUserAccount = async (userData) => {
14
- let username = formatUsername({ fullName: userData.fullName });
14
+ let username = formatUsername({ fullName: userData.fullName, email: userData.email });
15
15
 
16
16
  if (await userService.exists({ username })) {
17
17
  username += _.random(1000, 9999);
@@ -49,9 +49,9 @@ const ensureUserCreated = async (userData) => {
49
49
  }
50
50
  );
51
51
 
52
- return { user: changedUser, isNew: true };
52
+ return { user: changedUser, isNew: false };
53
53
  } else {
54
- throw new Error(`User with email ${userData.email} already exists`);
54
+ return { user, isNew: false };
55
55
  }
56
56
  }
57
57
 
@@ -62,6 +62,6 @@ const ensureUserCreated = async (userData) => {
62
62
  };
63
63
 
64
64
  module.exports = async (userData) => {
65
- const { updatedUser, isNew } = await ensureUserCreated(userData);
66
- return updatedUser;
65
+ const { user, isNew } = await ensureUserCreated(userData);
66
+ return user;
67
67
  };
@@ -6,8 +6,8 @@ const users = Joi.object({
6
6
  updatedOn: Joi.date(),
7
7
 
8
8
  email: Joi.string().email().required(),
9
- fullName: Joi.string().required(),
10
9
  username: Joi.string().required(),
10
+ fullName: Joi.string(),
11
11
  avatarUrl: Joi.string().uri(),
12
12
 
13
13
  password: Joi.string(),
@@ -74,7 +74,7 @@ const defineRoutes = async (app) => {
74
74
  app.use(tryToAttachUser);
75
75
 
76
76
  const resources = await getResources();
77
-
77
+ console.log('resources', resources)
78
78
  _.each(resources, async ({ name: resourceName }) => {
79
79
  const resourceRouter = new Router();
80
80
  const globalRouter = new Router();
@@ -0,0 +1,15 @@
1
+ const config = require('app-config');
2
+ const nodemailer = require('nodemailer');
3
+
4
+ config.assert('smtp');
5
+
6
+ module.exports = {
7
+ sendEmail: async ({ to, subject, html }) => {
8
+ const transporter = nodemailer.createTransport(config.smtp)
9
+
10
+ return await transporter.sendMail({
11
+ from: process.env.SMTP_USER,
12
+ to, subject, html
13
+ })
14
+ }
15
+ }
@@ -1,22 +0,0 @@
1
- #!/bin/sh
2
- DIR=$PROJECT_SRC
3
- echo CHECKING $DIR
4
-
5
- if [ -f "$DIR/package.json" ]; then
6
- echo "Project already initialized"
7
- else
8
- ### Control will jump here if $DIR does NOT exists ###
9
- echo "Configuring project..."
10
- cd "$( dirname "${BASH_SOURCE[0]}" )"
11
- cd ..
12
- pwd
13
- mkdir -p $PROJECT_SRC
14
-
15
- echo Unzipping project starter to $DIR
16
- unzip ./project-api-starter.zip -d $DIR
17
-
18
- echo dir before script
19
- ls $PROJECT_SRC
20
- fi
21
-
22
- exit 1