@jcbuisson/express-x 1.0.0 → 1.0.2

package/README.md

@@ -1,16 +1 @@
 
-# Migration initiale
-
-npx prisma migrate dev --name init
-
-
-# Run dev
-
-npx nodemon src/app.js
-
-
-# Run AdminJS
-
-npx ts-node src/admin.ts
-
-

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@jcbuisson/express-x",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
-  "main": "index.js",
+  "main": "src/expressX.js",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:buisson31/express-x.git"
@@ -11,21 +11,14 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-    "dev": "npx nodemon src/app.js",
-    "migrate": "npx prisma migrate dev --name init",
-    "admin": "npx ts-node src/admin.ts"
   },
   "keywords": [],
   "dependencies": {
-    "@adminjs/express": "^5.1.0",
-    "@adminjs/prisma": "^3.0.1",
     "@prisma/client": "^4.10.1",
     "config": "^3.3.9",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.0",
-    "nodemailer": "^6.9.1",
-    "socket.io": "^4.6.0",
-    "socket.io-client": "^4.6.0"
+    "socket.io": "^4.6.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.17"

package/src/expressX.js

@@ -1,19 +1,17 @@
 
 const http = require('http')
 const socketio = require('socket.io')
-const config = require('config')
 
 const { PrismaClient } = require('@prisma/client')
 
 /*
  * Enhance `app` express application with Feathers-like services
  */
-function enhanceExpress(app) {
+function expressX(app) {
    const prisma = new PrismaClient()
    app.set('prisma', prisma) // ?? BOF
 
    const services = {}
-   const publishCallbacks = {}
    const connections = {}
 
    let lastConnectionId = 1
@@ -22,71 +20,90 @@ function enhanceExpress(app) {
     * create a service `name` based on Prisma table `entity`
     */
    function createDatabaseService({ name, entity=name, client='prisma' }) {
-      const service = {
+      return createService({
          name,
          entity,
 
-         create: async (data) => {
-            // TODO...before hooks
-            const value = await prisma[entity].create({ data })
-            // TODO...after hook
-            return value
-         },
+         methods: {
+            create: (data) => prisma[entity].create({
+               data,
+            }),
 
-         get: async (id) => {
-            // TODO...before hooks
-            const value = await prisma[entity].findUnique({
+            get: (id) => prisma[entity].findUnique({
                where: {
-                 id,
+                  id,
                },
-            })
-            // TODO...after hook
-            return value
-         },
-
-         find: async (query = {}) => {
-            // ...before hooks
-            const values = await prisma[entity].findMany(query)
-            // ...after hook
-            return values
-         },
-
-         // pub/sub
-         publish: async (func) => {
-            publishCallbacks[name] = func
-         },
-      }
-      // cache service in `services`
-      services[name] = service
-      return service
+            }),
+
+            patch: (id, data) => prisma[entity].update({
+               where: {
+                  id,
+               },
+               data,
+            }),
+
+            remove: (id, data) => prisma[entity].delete({
+               where: {
+                  id,
+               },
+            }),
+
+            find: (options) => prisma[entity].findMany(options),
+         }
+      })
    }
 
    /*
-    * create a custom service `name`
+    * create a service `name` with given `methods`
     */
-   function createCustomService({ name, create, get, find, patch, update, remove }) {
-      const service = {
-         name,
+   function createService({ name, methods }) {
+      const service = { name }
+
+      for (const methodName in methods) {
+         const method = methods[methodName]
+
+         // `context` is the context of execution (transport type, connection, app)
+         // `args` is the list of arguments of the method
+         service[methodName] = async (context, ...args) => {
+            context.args = args
+
+            // call 'before' hooks, modifying `context.args`
+            const beforeMethodHooks = service?.hooks?.before && service.hooks.before[methodName] || []
+            const beforeAllHooks = service?.hooks?.before?.all || []
+            for (const hook of [...beforeMethodHooks, ...beforeAllHooks]) {
+               context = await hook({ ...context, args })
+            }
+
+            // call method
+            const result = await method(...context.args)
+            // console.log('result', result)
+
+            // call 'after' hooks
+            const afterMethodHooks = service?.hooks?.after && service.hooks.after[methodName] || []
+            const afterAllHooks = service?.hooks?.after?.all || []
+            for (const hook of [...afterMethodHooks, ...afterAllHooks]) {
+               context = await hook({ ...context, result })
+            }
+            return result
+         }
+      }
 
-         create: async (data) => {
-            // TODO...before hooks
-            const value = await create(data)
-            // TODO...after hook
-            return value
-         },
-
-         patch: async (id, data) => {
-            // TODO...before hooks
-            const value = await patch(id, data)
-            // TODO...after hook
-            return value
-         },
-
-         // pub/sub
-         publish: async (func) => {
-            publishCallbacks[name] = func
-         },
+      // un-hooked versions of methods: `_create`, etc.
+      for (const methodName in methods) {
+         const method = methods[methodName]
+         service['_' + methodName] = method
       }
+
+      // attach pub/sub publish callback
+      service.publish = async (func) => {
+         service.publishCallback = func
+      },
+
+      // attach hooks
+      service.hooks = (hooks) => {
+         service.hooks = hooks
+      }
+
       // cache service in `services`
       services[name] = service
       return service
@@ -103,25 +120,37 @@ function enhanceExpress(app) {
    }
 
    /*
-    * provide a REST endpoint at `path`, based on `service`
+    * add an HTTP REST endpoint at `path`, based on `service`
     */
-   function httpRestService(path, service) {
-      // console.log('path', path, 'service', service.name)
+   function addHttpRestRoutes(path, service) {
+
+      const context = {
+         app,
+         transport: 'http',
+      }
 
       app.post(path, async (req, res) => {
-         const value = await service.create(req.body)
+         const value = await service.create(context, req.body)
          res.json(value)
       })
 
       app.get(path, async (req, res) => {
-         const values = await service.find({
-            where: req.body,
-         })
+         const values = await service.find(context, req.body)
          res.json(values)
       })
 
       app.get(`${path}/:id`, async (req, res) => {
-         const value = await service.get(parseInt(req.params.id))
+         const value = await service.get(context, parseInt(req.params.id))
+         res.json(value)
+      })
+
+      app.patch(`${path}/:id`, async (req, res) => {
+         const value = await service.patch(context, parseInt(req.params.id), req.body)
+         res.json(value)
+      })
+
+      app.delete(`${path}/:id`, async (req, res) => {
+         const value = await service.remove(context, parseInt(req.params.id))
          res.json(value)
       })
    }
@@ -145,6 +174,7 @@ function enhanceExpress(app) {
       // emit 'connection' event for app (expressjs extends EventEmitter)
       app.emit('connection', connection)
 
+      // send 'connected' event to client
       socket.emit('connected', connection.id)
 
       socket.on('disconnect', () => {
@@ -157,27 +187,26 @@ function enhanceExpress(app) {
        * Handle websocket client request
        * Emit in return a 'client-response' message
        */
-      socket.on('client-request', async ({ uid, name, action, argList }) => {
-         console.log("client-request", uid, name, action, argList)
+      socket.on('client-request', async ({ uid, name, action, args }) => {
+         console.log("client-request", uid, name, action, args)
          if (name in services) {
             const service = services[name]
             try {
                const serviceMethod = service[action]
-               const result = await serviceMethod(...argList)
-               console.log('result', result)
 
-               // ?? BOF
-               if (name === 'authenticate' && result && !result.error) {
-                  console.log('### mark connection as secured', result)
-                  connection.accessToken = result.accessToken
+               const context = {
+                  app,
+                  transport: 'ws',
+                  connection,
                }
+               const result = await serviceMethod(context, ...args)
 
                io.emit('client-response', {
                   uid,
                   result,
                })
-               // send event on associated channels
-               const publishFunc = publishCallbacks[name]
+               // pub/sub: send event on associated channels
+               const publishFunc = service.publishCallback
                if (publishFunc) {
                   const channelNames = await publishFunc(result, app)
                   console.log('publish channels', name, action, channelNames)
@@ -215,18 +244,22 @@ function enhanceExpress(app) {
       connection.channelNames.add(channelName)
    }
 
+   function leaveChannel(channelName, connection) {
+      connection.channelNames.delete(channelName)
+   }
+
    // enhance `app` with objects and methods
    Object.assign(app, {
       createDatabaseService,
-      createCustomService,
+      createService,
       service,
       configure,
-      httpRestService,
+      addHttpRestRoutes,
       server,
       joinChannel,
+      leaveChannel,
    })
+   return app
 }
 
-module.exports = {
-   enhanceExpress,
-}
+module.exports = expressX

package/.adminjs/.entry.js

@@ -1 +0,0 @@
-AdminJS.UserComponents = {}

package/.env

@@ -1,2 +0,0 @@
-DATABASE_URL="postgresql://chris:eureka31@localhost:5432/blog?schema=public"
-# DATABASE_URL="postgres://chris:eureka31@localhost:5432/mitab-dev"

package/app.js

@@ -1,28 +0,0 @@
-var express = require('express')
-var app = express()
-var http = require('http').createServer(app);
-var io = require('socket.io')(http);
-
-app.get('/', function (req, res) {
-  res.sendFile(__dirname + '/index.html');
-});
-
-http.listen(process.env.PORT || 3000, function() {
-  var host = http.address().address
-  var port = http.address().port
-  console.log('App listening at http://%s:%s', host, port)
-});
-
-io.on('connection', function(socket) {
-  console.log('Client connected to the WebSocket');
-
-  socket.on('disconnect', () => {
-    console.log('Client disconnected');
-  });
-
-  socket.on('chat message', function(msg) {
-    console.log("Received a chat message");
-    io.emit('chat message', msg);
-  });
-})
-

package/config/default.js

@@ -1,36 +0,0 @@
-
-module.exports = {
-
-   authentication: {
-      entity: "user",
-      service: "user",
-      secret: "A3lxcjmVD0af6Hjd1fksZyzFGtE=",
-      authStrategies: [
-         "local"
-      ],
-      jwtOptions: {
-         header: {
-            typ: "access"
-         },
-         audience: "https://mitab.com",
-         issuer: "feathers",
-         algorithm: "HS256",
-         expiresIn: "100y"
-      },
-      local: {
-         usernameField: "pseudo",
-         passwordField: "password"
-      }
-   },
-
-   NODEMAILER: {
-      host: "smtp.online.net",
-      port: 587,
-      secure: false,
-      auth: {
-         user: "contact@shdl.fr",
-         pass: "Eurek@31",
-      },
-      name: "shdl.fr",
-   },
-}

package/frontend/.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-  "recommendations": ["Vue.volar"]
-}

package/frontend/README.md

@@ -1,7 +0,0 @@
-# Vue 3 + Vite
-
-This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
-
-## Recommended IDE Setup
-
-- [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)

package/frontend/index.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
-  </body>
-</html>

package/frontend/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "frontend",
-  "private": true,
-  "version": "0.0.0",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview",
-    "admin": "npx ts-node src/admin.ts"
-  },
-  "dependencies": {
-    "socket.io-client": "^4.6.0",
-    "uuid": "^9.0.0",
-    "vue": "^3.2.25"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^2.3.4",
-    "vite": "^2.9.15"
-  }
-}

package/frontend/src/App.vue

@@ -1,83 +0,0 @@
-<template>
-   <div> <input v-model="pseudo"> pseudo </div>
-   <div> <input v-model="password"> password </div>
-
-   <button @click="signin">signin</button>
-   <button @click="addUser">add user</button>
-   <button @click="sendMail">send mail</button>
-   <hr>
-   <p>Is authenticated: {{ isAuthenticated }}</p>
-   
-   <div v-for="user in users">
-      <li>{{ user.name  }}</li>
-   </div>
-   
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import expressxClient from './expressx-client'
-
-
-const app = expressxClient()
-// app.configure(feathers.authentication({ storage: window.sessionStorage }))
-
-
-const users = ref([])
-const pseudo = ref()
-const password = ref()
-
-const isAuthenticated = ref(false)
-
-
-app.service('user').on('create', user => {
-   console.log('USER EVENT created', user)
-   users.value.push(user)
-})
-
-app.service('authenticate').on('create', user => {
-   console.log('AUTHENTICATE EVENT created', user)
-   isAuthenticated.value = true
-})
-app.service('authenticate').on('patch', () => {
-   console.log('(RE)AUTHENTICATE EVENT patch')
-   isAuthenticated.value = true
-})
-
-
-onMounted(async () => {
-   users.value = await app.service('user').find()
-})
-
-const addUser = async () => {
-   const user = await app.service('user').create({
-      pseudo: pseudo.value,
-      password: password.value,
-   })
-   console.log('created user', user)
-}
-
-const signin = async () => {
-   const { error, accessToken, user } = await app.service('authenticate').create({
-      strategy: 'local',
-      username: pseudo.value,
-      password: password.value,
-   })
-   console.log('authenticate', error, accessToken, user)
-   if (error) {
-      alert(error)
-   } else {
-      window.sessionStorage.setItem('feathers-jwt', accessToken)
-   }
-}
-
-const sendMail = () => {
-   app.service('mailer').create({
-      to: "buisson@n7.fr",
-      from: "buisson@nasa.gov",
-      subject: "Fake",
-      text: "Hello from NASA",
-   })
-}
-
-</script>

package/frontend/src/expressx-client.js

@@ -1,83 +0,0 @@
-
-import { io } from 'socket.io-client'
-import { v4 } from 'uuid'
-
-function expressxClient() {
-
-   const socket = io()
-
-   const waitingPromises = {}
-   const action2service2handlers = {}
-
-   // on connection
-   socket.on("connected", async (connectionId) => {
-      console.log('connected', connectionId)
-      const token = window.sessionStorage.getItem('feathers-jwt')
-      if (token) {
-         // disconnect/reconnect: reauthenticate
-         console.log('reauthenticate with', token)
-         serviceMethodRequest('authenticate', 'patch', [token])
-      }
-   })
-
-   // on receiving response from service request
-   socket.on('client-response', ({ uid, error, result }) => {
-      console.log('client-response', uid, error, result)
-      if (!uid in waitingPromises) return // ???
-      const [resolve, reject] = waitingPromises[uid]
-      if (error) {
-         reject(error)
-      } else {
-         resolve(result)
-      }
-      delete waitingPromises[uid]
-   })
-
-   // on receiving events from pub/sub
-   socket.on('service-event', ({ name, action, result }) => {
-      if (!action2service2handlers[action]) action2service2handlers[action] = {}
-      const serviceHandlers = action2service2handlers[action]
-      const handler = serviceHandlers[name]
-      if (handler) handler(result)
-   })
-
-   async function serviceMethodRequest(name, action, argList) {
-      const uid = v4()
-      const promise = new Promise((resolve, reject) => {
-         waitingPromises[uid] = [resolve, reject]
-      })
-      socket.emit('client-request', {
-         uid,
-         name,
-         action,
-         argList,
-      })
-      return promise
-   }
-
-   function service(name) {
-      return {
-         create: (data) => serviceMethodRequest(name, 'create', [data]),
-         get: (id) => serviceMethodRequest(name, 'create', [id]),
-         patch: (id, data) => serviceMethodRequest(name, 'create', [id, data]),
-         update: (id, data) => serviceMethodRequest(name, 'update', [id, data]),
-         remove: (id) => serviceMethodRequest(name, 'remove', [id]),
-         find: (data) => serviceMethodRequest(name, 'find', [data]),
-
-         // associate a handler to a pub/sub event for this service
-         on: (action, handler) => {
-            if (!action2service2handlers[action]) action2service2handlers[action] = {}
-            const serviceHandlers = action2service2handlers[action]
-            serviceHandlers[name] = handler
-            console.log('action2service2handlers', action2service2handlers)
-         },
-      }
-   }
-
-   return {
-      service,
-      socket,
-   }
-}
-
-export default expressxClient

package/frontend/src/main.js

@@ -1,4 +0,0 @@
-import { createApp } from 'vue'
-import App from './App.vue'
-
-createApp(App).mount('#app')

package/frontend/tsconfig.json

@@ -1,9 +0,0 @@
-{
-   "compilerOptions": {
-     "sourceMap": true,
-     "outDir": "dist",
-     "strict": true,
-     "lib": ["esnext"],
-     "esModuleInterop": true
-   }
-}

package/frontend/vite.config.js

@@ -1,28 +0,0 @@
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-
-// https://vitejs.dev/config/
-export default defineConfig({
-   plugins: [
-      vue()
-   ],
-   server: {
-      port: 3000,
-      open: true,
-      host: true, // allows for external device connection on local network
-      proxy: {
-         '^/socket.io/.*': {
-            target: 'http://localhost:3030',
-            changeOrigin: true,
-            ws: true,
-            secure: false,
-         },
-         '/api': {
-            target: 'http://localhost:3030',
-            changeOrigin: true,
-            ws: false,
-            secure: false,      
-         },
-      }
-   },
-})

package/index.html

@@ -1,106 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <title>Greetings from a sample Node.js app built with the Socket.IO framework!</title>
-    <meta content='website' property='og:type'>
-    <meta content='https://cdn.scalingo.com/homepage/assets/fb-33a6a93ddbf90bfdae57407481aa05a4.png' property='og:image'>
-    <meta content="Deploying your own Node.js/Socket.IO app on Scalingo is as easy as pie: JUST CLICK THIS BUTTON! It will be up in less than 2 minutes!" property='og:description'>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <link rel="shortcut icon" href="https://scalingo.com/favicon.ico" type="image/vnd.microsoft.icon">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.2.0/normalize.min.css">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,500" rel="stylesheet">
-    <style>
-      body { color: #373a3c; font-family: 'Roboto', sans-serif; font-size: 1rem; line-height: 1.5; font-weight: 300; }
-      .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-        color: inherit;
-        font-family: inherit;
-        font-weight: 500;
-        line-height: 1.1;
-        margin-bottom: 1rem;
-        margin-top: 0;
-      }
-      a { color: #0275d8; text-decoration: none; background-color: transparent; }
-      a:focus, a:hover { color: #014c8c; text-decoration: underline; text-decoration: none; }
-      a:focus { outline: thin dotted; outline-offset: -2px; }
-      .container { margin: 0 auto; text-align: center; }
-      .hero { padding: 3rem 1.5rem; }
-      .love { margin-bottom: 2rem; }
-      h1 { font-size: 2.5rem; margin-bottom: 2rem; }
-      h2 { font-size: 1.6rem; font-weight: 300; }
-      small { margin-top: 0; }
-      .btn {
-        overflow: visible;
-        text-transform: uppercase;
-        text-decoration: none;
-        margin: 1em 0;
-        -moz-user-select: none;
-        border-radius: 0.25rem;
-        cursor: pointer;
-        display: inline-block;
-        font-size: 1rem;
-        font-weight: 400;
-        line-height: 1.5;
-        padding: 0.375rem 1rem;
-        text-align: center;
-        vertical-align: middle;
-        white-space: nowrap;
-        background-color: #0275d8;
-        border-color: #0275d8;
-        color: #fff;
-        border-radius: 0.3rem;
-        font-size: 1.25rem;
-        line-height: 1.33333;
-        padding: 0.75rem 1.25rem;
-      }
-      .btn:hover, .btn:focus, .btn:active { background-color: #025aa5; border-color: #01549b; color: #fff; background-image: none; }
-      .btn:active:focus, .btn:active:hover { background-color: #014682; border-color: #01315a; color: #fff; }
-      .scalingo-logo { max-width: 100%; height: auto; width: 330px; }
-      .heart-logo { margin: 0 20px; width:56px;position:relative; top:-18px; }
-      .tech-logo { width:56px;height:72px; }
-      @media (min-width:768px){
-        .container { width: 800px; }
-        .one-liner { display: block; }
-      }
-      @media (max-width:767px){
-        .scalingo-logo, .heart-logo, .tech-logo { display: block; position: unset; margin: 0 auto; }
-        .scalingo-logo, .heart-logo { margin-bottom: 1rem; }
-      }
-
-
-
-      /* * { margin: 0; padding: 0; box-sizing: border-box; } */
-      /* body { font: 13px Helvetica, Arial; } */
-      form { background: #000; padding: 3px; position: fixed; bottom: 0; width: 100%; }
-      form input { border: 0; padding: 10px; width: 90%; margin-right: 0.5%; }
-      form button { width: 8%; background: rgb(130, 224, 255); border: none; padding: 10px; cursor: pointer; }
-      #messages { list-style-type: none; margin: 0; padding: 0; }
-      #messages li { padding: 5px 10px; }
-      #messages li:nth-child(odd) { background: #eee; }
-    </style>
-  </head>
-  <body>
-    <ul id="messages"></ul>
-    <form action="">
-      <input id="m" autocomplete="off" /><button>Send</button>
-    </form>
-
-    <script src="/socket.io/socket.io.js"></script>
-    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-    <script>
-      $(function () {
-        var socket = io();
-        $('form').submit(function(e) {
-          e.preventDefault(); // prevents page reloading
-          socket.emit('chat message', $('#m').val());
-          $('#m').val('');
-          return false;
-        });
-        socket.on('chat message', function(msg){
-          $('#messages').append($('<li>').text(msg));
-        });
-      });
-    </script>
-  </body>
-</html>

package/prisma/migrations/20230222122754_init/migration.sql

@@ -1,24 +0,0 @@
--- CreateTable
-CREATE TABLE "User" (
-    "id" SERIAL NOT NULL,
-    "pseudo" TEXT NOT NULL,
-    "password" TEXT NOT NULL,
-    "name" TEXT,
-
-    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "Post" (
-    "id" SERIAL NOT NULL,
-    "title" TEXT NOT NULL,
-    "authorId" INTEGER,
-
-    CONSTRAINT "Post_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "User_pseudo_key" ON "User"("pseudo");
-
--- AddForeignKey
-ALTER TABLE "Post" ADD CONSTRAINT "Post_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;

package/prisma/migrations/20230222150825_init/migration.sql

@@ -1,5 +0,0 @@
--- DropForeignKey
-ALTER TABLE "Post" DROP CONSTRAINT "Post_authorId_fkey";
-
--- AddForeignKey
-ALTER TABLE "Post" ADD CONSTRAINT "Post_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/migrations/migration_lock.toml

@@ -1,3 +0,0 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"

package/prisma/schema.prisma

@@ -1,26 +0,0 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
-generator client {
-  provider = "prisma-client-js"
-}
-
-model User {
-  id        Int     @default(autoincrement()) @id
-  pseudo    String  @unique
-  password  String
-  name      String?
-  posts     Post[]
-}
-
-model Post {
-  id        Int     @default(autoincrement()) @id
-  title     String
-  author    User?   @relation(fields: [authorId], references: [id], onDelete: Cascade)
-  authorId  Int?
-}
-
-datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
-}

package/src/admin.ts

@@ -1,42 +0,0 @@
-import express from 'express'
-import AdminJS from 'adminjs'
-import AdminJSExpress from '@adminjs/express'
-import { Database, Resource } from '@adminjs/prisma'
-import { PrismaClient } from '@prisma/client'
-import { DMMFClass } from '@prisma/client/runtime'
-
-const PORT = process.env.port || 3020
-
-const prisma = new PrismaClient()
-
-AdminJS.registerAdapter({ Database, Resource })
-
-const run = async () => {
-  const app = express()
-
-  // `_baseDmmf` contains necessary Model metadata. `PrismaClient` type doesn't have it included
-  const dmmf = ((prisma as any)._baseDmmf as DMMFClass)
-
-  const admin = new AdminJS({
-    resources: [{
-      resource: { model: dmmf.modelMap.User, client: prisma },
-      options: {},
-    }, {
-      resource: { model: dmmf.modelMap.Post, client: prisma },
-      options: {},
-    }],
-  })
-
-  const router = AdminJSExpress.buildRouter(admin)
-
-  app.use(admin.options.rootPath, router)
-
-  app.listen(PORT, () => {
-    console.log(`Example app listening at http://localhost:${PORT}`)
-  })
-}
-
-run()
-  .finally(async () => {
-    await prisma.$disconnect()
-  })

package/src/app.js

@@ -1,42 +0,0 @@
-
-const express = require('express')
-const { enhanceExpress } = require('./expressX')
-
-const mailService = require('./services/mail.service')
-const authenticateService = require('./services/authenticate.service')
-
-
-const app = express()
-enhanceExpress(app)
-
-
-app.createDatabaseService({name: 'user', client: 'prisma' })
-
-// app.createAuthService(config.get('authentication'))
-
-app.configure(mailService)
-app.configure(authenticateService)
-
-
-app.httpRestService('/api/user', app.service('user'))
-
-
-// serve index.html
-app.get('/', function (req, res) {
-   res.sendFile(__dirname + '/index.html')
-})
-
-app.server.listen(3030, () => console.log('App listening at http://localhost:3030'))
-
-
-app.on('connection', (connection) => {
-   console.log('connection', connection.id)
-   app.joinChannel('everyone', connection)
-})
-
-app.service('user').publish(async (user, context) => {
-   return ['everyone']
-})
-app.service('authenticate').publish(async (user, context) => {
-   return ['everyone']
-})

package/src/index.html

@@ -1,106 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <title>Greetings from a sample Node.js app built with the Socket.IO framework!</title>
-    <meta content='website' property='og:type'>
-    <meta content='https://cdn.scalingo.com/homepage/assets/fb-33a6a93ddbf90bfdae57407481aa05a4.png' property='og:image'>
-    <meta content="Deploying your own Node.js/Socket.IO app on Scalingo is as easy as pie: JUST CLICK THIS BUTTON! It will be up in less than 2 minutes!" property='og:description'>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <link rel="shortcut icon" href="https://scalingo.com/favicon.ico" type="image/vnd.microsoft.icon">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.2.0/normalize.min.css">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,500" rel="stylesheet">
-    <style>
-      body { color: #373a3c; font-family: 'Roboto', sans-serif; font-size: 1rem; line-height: 1.5; font-weight: 300; }
-      .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-        color: inherit;
-        font-family: inherit;
-        font-weight: 500;
-        line-height: 1.1;
-        margin-bottom: 1rem;
-        margin-top: 0;
-      }
-      a { color: #0275d8; text-decoration: none; background-color: transparent; }
-      a:focus, a:hover { color: #014c8c; text-decoration: underline; text-decoration: none; }
-      a:focus { outline: thin dotted; outline-offset: -2px; }
-      .container { margin: 0 auto; text-align: center; }
-      .hero { padding: 3rem 1.5rem; }
-      .love { margin-bottom: 2rem; }
-      h1 { font-size: 2.5rem; margin-bottom: 2rem; }
-      h2 { font-size: 1.6rem; font-weight: 300; }
-      small { margin-top: 0; }
-      .btn {
-        overflow: visible;
-        text-transform: uppercase;
-        text-decoration: none;
-        margin: 1em 0;
-        -moz-user-select: none;
-        border-radius: 0.25rem;
-        cursor: pointer;
-        display: inline-block;
-        font-size: 1rem;
-        font-weight: 400;
-        line-height: 1.5;
-        padding: 0.375rem 1rem;
-        text-align: center;
-        vertical-align: middle;
-        white-space: nowrap;
-        background-color: #0275d8;
-        border-color: #0275d8;
-        color: #fff;
-        border-radius: 0.3rem;
-        font-size: 1.25rem;
-        line-height: 1.33333;
-        padding: 0.75rem 1.25rem;
-      }
-      .btn:hover, .btn:focus, .btn:active { background-color: #025aa5; border-color: #01549b; color: #fff; background-image: none; }
-      .btn:active:focus, .btn:active:hover { background-color: #014682; border-color: #01315a; color: #fff; }
-      .scalingo-logo { max-width: 100%; height: auto; width: 330px; }
-      .heart-logo { margin: 0 20px; width:56px;position:relative; top:-18px; }
-      .tech-logo { width:56px;height:72px; }
-      @media (min-width:768px){
-        .container { width: 800px; }
-        .one-liner { display: block; }
-      }
-      @media (max-width:767px){
-        .scalingo-logo, .heart-logo, .tech-logo { display: block; position: unset; margin: 0 auto; }
-        .scalingo-logo, .heart-logo { margin-bottom: 1rem; }
-      }
-
-
-
-      /* * { margin: 0; padding: 0; box-sizing: border-box; } */
-      /* body { font: 13px Helvetica, Arial; } */
-      form { background: #000; padding: 3px; position: fixed; bottom: 0; width: 100%; }
-      form input { border: 0; padding: 10px; width: 90%; margin-right: 0.5%; }
-      form button { width: 8%; background: rgb(130, 224, 255); border: none; padding: 10px; cursor: pointer; }
-      #messages { list-style-type: none; margin: 0; padding: 0; }
-      #messages li { padding: 5px 10px; }
-      #messages li:nth-child(odd) { background: #eee; }
-    </style>
-  </head>
-  <body>
-    <ul id="messages"></ul>
-    <form action="">
-      <input id="m" autocomplete="off" /><button>Send</button>
-    </form>
-
-    <script src="/socket.io/socket.io.js"></script>
-    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-    <script>
-      $(function () {
-        var socket = io();
-        $('form').submit(function(e) {
-          e.preventDefault(); // prevents page reloading
-          socket.emit('chat message', $('#m').val());
-          $('#m').val('');
-          return false;
-        });
-        socket.on('chat message', function(msg){
-          $('#messages').append($('<li>').text(msg));
-        });
-      });
-    </script>
-  </body>
-</html>

package/src/node-client.js

@@ -1,28 +0,0 @@
-#!/usr/bin/env node
-const { io } = require("socket.io-client");
-
-
-async function main() {
-   try {
-      const socket = io(`http://localhost:3030`)
-
-      socket.on("hello", (arg) => {
-         console.log(arg)
-
-         socket.emit('find-request', {
-            uid: 'azer',
-            name: 'user',
-         })
-      })
-
-      socket.on("find-response", ({ uid, values }) => {
-         console.log('find-response', uid, values)
-      })
-
-   } catch(err) {
-      console.log("*** error", err)
-   }
-}
-
-main()
-

package/src/services/authenticate.service.js

@@ -1,53 +0,0 @@
-
-const config = require('config')
-const jwt = require('jsonwebtoken')
-
-
-module.exports = function (app) {
-
-   const prisma = app.get('prisma') // BOF
-
-   app.createCustomService({
-      name: 'authenticate',
-
-      create: async ({ uid, strategy, username, password }) => {
-         console.log('authenticate data', strategy, username, password)
-         try {
-            const entity = config.authentication.entity
-            const usernameField = config.authentication[strategy].usernameField
-            const passwordField = config.authentication[strategy].passwordField
-            console.log("authenticate-request", uid, strategy, username, password, usernameField, passwordField)
-            // check if a user exists with this username
-            const where = {}
-            where[usernameField] = username
-            const user = await prisma[entity].findUnique({ where })
-            if (user) {
-               // user exists; check password
-               if (user.password === password) {
-                  const accessToken = jwt.sign({ sub: user.id }, config.authentication.secret, config.authentication.jwtOptions)
-                  return {
-                     accessToken,
-                     user,
-                  }
-               } else {
-                  return {
-                     error: "Incorrect credentials",
-                  }
-               }
-            } else {
-               return {
-                  error: "Incorrect credentials",
-               }
-            }
-         } catch(err) {
-            return {
-               error: err.toString(),
-            }
-         }
-      },
-
-      patch: async (accessToken) => {
-         return 'ok'
-      }
-   })
-}

package/src/services/mail.service.js

@@ -1,25 +0,0 @@
-
-const nodemailer = require('nodemailer')
-const config = require('config')
-
-
-module.exports = function (app) {
-
-   app.createCustomService({
-      name: 'mailer',
-      create: ({ from, to, subject, text }) => {
-         try {
-            const transporter = nodemailer.createTransport(config.NODEMAILER)
-            return transporter.sendMail({
-               from,
-               to,
-               subject,
-               text,
-               html: text,
-            })
-         } catch(err) {
-            console.log('err mail', err)
-         }
-      },
-   })
-}

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-   "compilerOptions": {
-     "sourceMap": true,
-     "outDir": "dist",
-     "strict": true,
-     "lib": ["esnext"],
-     "esModuleInterop": true
-   }
-}