@sequencemedia/minimserver 0.1.24 → 1.1.27

package/{app.js → app.mjs}

@@ -1,23 +1,29 @@
 #!/usr/bin/env node
 
-require('dotenv/config')
+import 'dotenv/config'
 
-const debug = require('debug')
+import debug from 'debug'
 
-const psList = require('ps-list')
+import {
+  readFile
+} from 'fs/promises'
 
-const {
-  execute
-} = require('./lib')
+import psList from 'ps-list'
 
-const commander = require('commander')
+import commander from 'commander'
 
-const PACKAGE = require('./package')
+import execute from '#minimserver'
+
+const log = debug('@sequencemedia/minimserver')
+
+log('`minimserver` is awake')
 
 const NAME = 'ms.App'
 process.title = NAME
 
 async function app () {
+  const PACKAGE = JSON.parse(await readFile('./package.json', 'utf8'))
+
   const {
     name
   } = PACKAGE
@@ -38,21 +44,19 @@ async function app () {
         pid
       } = a.find(({ pid }) => pid !== PID)
 
-      const log = debug('minimserver:process:log')
+      const log = debug('@sequencemedia/minimserver:process:log')
 
       log(`Killing application "${name}" in process ${pid}.`)
 
       process.kill(pid)
     }
   } catch ({ message }) {
-    const error = debug('minimserver:process:error')
+    const error = debug('@sequencemedia/minimserver:process:error')
 
     error(message)
     return
   }
 
-  const log = debug('minimserver:log')
-
   const {
     pid,
     argv,
@@ -86,7 +90,7 @@ async function app () {
       code
     } = e
 
-    const error = debug('minimserver:commander:error')
+    const error = debug('@sequencemedia/minimserver:commander:error')
 
     if (code !== 'commander.missingMandatoryOptionValue') error(e)
 
@@ -113,10 +117,10 @@ async function app () {
   try {
     await execute(origin, destination, server, ignore, bounce)
   } catch ({ message }) {
-    const error = debug('minimserver:execute:error')
+    const error = debug('@sequencemedia/minimserver:execute:error')
 
     error(message)
   }
 }
 
-module.exports = app()
+export default app()

package/babel.config.cjs

@@ -0,0 +1,21 @@
+const presets = [
+  [
+    '@babel/env',
+    {
+      targets: {
+        node: 'current'
+      },
+      useBuiltIns: 'usage',
+      corejs: 3
+    }
+  ]
+]
+
+const plugins = []
+
+module.exports = {
+  compact: true,
+  comments: false,
+  presets,
+  plugins
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/minimserver",
-  "version": "0.1.24",
+  "version": "1.1.27",
   "description": "Watch for changes to M3Us and rescan MinimServer",
   "keywords": [
     "minimserver",
@@ -14,11 +14,11 @@
     "m3u",
     "m3u8"
   ],
-  "main": "./app.js",
+  "main": "./app.mjs",
   "author": "Jonathan Perry for Sequence Media Limited <sequencemedia@sequencemedia.net>",
   "license": "MIT",
   "engines": {
-    "node": ">=12.19.0"
+    "node": ">=16.13.0"
   },
   "repository": {
     "type": "git",
@@ -29,46 +29,36 @@
     "url": "https://github.com/sequencemedia/minimserver/issues"
   },
   "scripts": {
-    "build": "npm run babel",
-    "build:watch": "npm run babel:watch",
-    "clean": "rimraf lib",
-    "babel": "babel src -d lib",
-    "babel:watch": "npm run babel -- -w",
-    "lint": "eslint .",
+    "lint": "eslint . --ext .mjs --ext .cjs",
     "lint:fix": "npm run lint -- --fix",
-    "start": "cross-env DEBUG=minimserver*,itunes* NODE_ENV=production node app",
-    "start:dev": "cross-env DEBUG=minimserver*,itunes* NODE_ENV=development node app",
-    "prepublishOnly": "npm run build",
-    "prebuild": "npm run clean"
+    "start": "cross-env DEBUG=@sequencemedia/minimserver* NODE_ENV=production node .",
+    "dev": "cross-env DEBUG=@sequencemedia/minimserver* NODE_ENV=development node ."
   },
   "dependencies": {
     "anymatch": "^3.1.2",
     "chokidar": "^3.5.2",
-    "commander": "^8.1.0",
+    "commander": "^8.3.0",
     "cross-env": "^7.0.3",
-    "debug": "^4.3.2",
+    "debug": "^4.3.3",
     "del": "^6.0.0",
     "dotenv": "^10.0.0",
     "fs-extra": "^10.0.0",
-    "ps-list": "^7.2.0",
-    "sacred-fs": "^1.2.1",
-    "supports-color": "^9.0.2"
+    "ps-list": "^8.0.0",
+    "supports-color": "^9.2.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.14.8",
-    "@babel/plugin-proposal-export-default-from": "^7.14.5",
-    "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-    "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.14.8",
-    "@babel/register": "^7.14.5",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-syntax-async-functions": "^6.13.0",
-    "core-js": "^3.16.0",
-    "@babel/eslint-parser": "^7.14.7",
-    "eslint": "^7.32.0",
-    "eslint-import-resolver-babel-module": "^5.3.1",
-    "rimraf": "^3.0.2",
-    "standard": "^16.0.3"
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.5",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
+    "core-js": "^3.20.1",
+    "eslint": "7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "5.2.0"
+  },
+  "imports": {
+    "#minimserver": "./src/index.mjs"
   }
 }

package/src/{index.js → index.mjs}

@@ -1,27 +1,31 @@
+import debug from 'debug'
+
 import os from 'os'
 import path from 'path'
 import {
   exec
 } from 'child_process'
 
-import {
-  ensureDir,
-  ensureFile
-} from 'fs-extra'
+import fsExtra from 'fs-extra'
 
 import {
   stat,
   copyFile
-} from 'sacred-fs'
+} from 'fs/promises'
 
 import chokidar from 'chokidar'
 import anymatch from 'anymatch'
 import del from 'del'
 
-import debug from 'debug'
+const {
+  ensureDir,
+  ensureFile
+} = fsExtra
+
+const error = debug('@sequencemedia/minimserver:error')
+const log = debug('@sequencemedia/minimserver')
 
-const error = debug('minimserver:error')
-const log = debug('minimserver:log')
+log('`minimserver` is awake')
 
 async function originDirExists (path) {
   try {
@@ -43,19 +47,36 @@ async function originDirExists (path) {
   }
 }
 
-const removeAllM3UFromDestinationDir = async (path) => del(path, { force: true })
+export async function removeAllM3UFromDestinationDir (path) {
+  /**
+   *  log('removeAllM3UFromDestinationDir')
+   */
+  return (
+    await del(path, { force: true })
+  )
+}
 
-const ensureDestinationDir = (path) => (
-  new Promise((resolve, reject) => {
-    ensureDir(path, (e) => (!e) ? resolve() : reject(e))
-  })
-)
+export function ensureDestinationDir (path) {
+  /*
+   *  log('ensureDestinationDir')
+   */
+  return (
+    new Promise((resolve, reject) => {
+      ensureDir(path, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
 
-const ensureDestinationM3U = (filePath) => (
-  new Promise((resolve, reject) => {
-    ensureFile(filePath, (e) => (!e) ? resolve() : reject(e))
-  })
-)
+export function ensureDestinationM3U (filePath) {
+  /*
+   *  log('ensureDestinationM3U')
+   */
+  return (
+    new Promise((resolve, reject) => {
+      ensureFile(filePath, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
 
 export function rescan (server) {
   /*
@@ -112,7 +133,9 @@ export function createFactory (origin, destination) {
 
     try {
       await ensureDestinationM3U(to)
-      return copyFile(filePath, to)
+      return (
+        await copyFile(filePath, to)
+      )
     } catch (e) {
       const {
         code
@@ -142,7 +165,9 @@ export function changeFactory (origin, destination) {
 
     try {
       await ensureDestinationM3U(to)
-      return copyFile(filePath, to)
+      return (
+        await copyFile(filePath, to)
+      )
     } catch (e) {
       const {
         code
@@ -171,7 +196,9 @@ export function removeFactory (origin, destination) {
     log('remove', to)
 
     try {
-      return del(to, { force: true })
+      return (
+        await del(to, { force: true })
+      )
     } catch ({ message }) {
       error(message)
     }
@@ -324,7 +351,7 @@ export function ignorePatternFactory (ignore) {
   }
 }
 
-export async function execute (
+export default async function execute (
   origin = '.',
   destination = '.',
   server = 'http://0.0.0.0:9790',
@@ -383,7 +410,7 @@ export async function execute (
           error(message)
         }
       })
-      .on('error', ({ message }) => {
+      .on('error', function handleError ({ message }) {
         error(`Error in watcher: "${message}"`)
       })
 

package/.circleci/config.yml

@@ -1,58 +0,0 @@
-version: 2.1
-
-jobs:
-  publish:
-    docker:
-      - image: circleci/node:lts
-    steps:
-      - checkout
-      - run:
-          name: Publish to NPM
-          command: |
-            echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-
-            PATTERN="([0-9]+)\.([0-9]+)\.([0-9]+)"
-            NAME=$(node -p "require('./package').name")
-            VERSION=$(node -p "require('./package').version")
-            PUBLISHED_VERSION=$(npm view $NAME version)
-
-            echo Version is $VERSION
-            echo Published version is $PUBLISHED_VERSION
-
-            [[ $VERSION =~ $PATTERN ]]
-
-            VERSION_MAJOR="${BASH_REMATCH[1]}"
-            VERSION_MINOR="${BASH_REMATCH[2]}"
-            VERSION_PATCH="${BASH_REMATCH[3]}"
-
-            [[ $PUBLISHED_VERSION =~ $PATTERN ]]
-
-            PUBLISHED_VERSION_MAJOR="${BASH_REMATCH[1]}"
-            PUBLISHED_VERSION_MINOR="${BASH_REMATCH[2]}"
-            PUBLISHED_VERSION_PATCH="${BASH_REMATCH[3]}"
-
-            if [ $VERSION_MAJOR -gt $PUBLISHED_VERSION_MAJOR ] || [ $VERSION_MINOR -gt $PUBLISHED_VERSION_MINOR ] || [ $VERSION_PATCH -gt $PUBLISHED_VERSION_PATCH ]
-            then
-              set +e
-
-              npm ci
-              npm publish
-
-              if [[ $? != 0 ]];
-              then
-                echo Version $VERSION was not published
-              else
-                echo Published version $VERSION
-              fi
-            fi
-
-workflows:
-  version: 2
-  commit-workflow:
-    jobs:
-      - publish:
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /^v.*/

package/.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    reviewers:
-      - sequencemedialimited

package/babel.config.js

@@ -1,34 +0,0 @@
-const presets = [
-  [
-    '@babel/env',
-    {
-      useBuiltIns: 'usage',
-      targets: {
-        node: '12.9.0'
-      },
-      corejs: 3
-    }
-  ]
-]
-
-const plugins = [
-  '@babel/proposal-export-default-from',
-  '@babel/proposal-export-namespace-from',
-  'syntax-async-functions',
-  [
-    'module-resolver', {
-      root: ['./src'],
-      cwd: 'babelrc',
-      alias: {
-        '~': './src'
-      }
-    }
-  ]
-]
-
-module.exports = {
-  compact: true,
-  comments: false,
-  presets,
-  plugins
-}

package/lib/index.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.rescan=rescan;exports.restart=restart;exports.relaunch=relaunch;exports.exit=exit;exports.createFactory=createFactory;exports.changeFactory=changeFactory;exports.removeFactory=removeFactory;exports.queueRescanFactory=queueRescanFactory;exports.queueRestartFactory=queueRestartFactory;exports.queueRelaunchFactory=queueRelaunchFactory;exports.ignorePatternFactory=ignorePatternFactory;exports.execute=execute;var _os=_interopRequireDefault(require("os"));var _path=_interopRequireDefault(require("path"));var _child_process=require("child_process");var _fsExtra=require("fs-extra");var _sacredFs=require("sacred-fs");var _chokidar=_interopRequireDefault(require("chokidar"));var _anymatch=_interopRequireDefault(require("anymatch"));var _del=_interopRequireDefault(require("del"));var _debug=_interopRequireDefault(require("debug"));function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const error=(0,_debug.default)('minimserver:error');const log=(0,_debug.default)('minimserver:log');async function originDirExists(path){try{await(0,_sacredFs.stat)(path);return true;}catch(e){const{code}=e;if(code!=='ENOENT'){const{message}=e;error(message);}return false;}}const removeAllM3UFromDestinationDir=async path=>(0,_del.default)(path,{force:true});const ensureDestinationDir=path=>new Promise((resolve,reject)=>{(0,_fsExtra.ensureDir)(path,e=>!e?resolve():reject(e));});const ensureDestinationM3U=filePath=>new Promise((resolve,reject)=>{(0,_fsExtra.ensureFile)(filePath,e=>!e?resolve():reject(e));});function rescan(server){return new Promise((resolve,reject)=>{(0,_child_process.exec)(`curl -X POST -H "Content-Type: text/plain" ${server} -d rescan`,(e,r)=>!e?resolve(r):reject(e));});}function restart(server){return new Promise((resolve,reject)=>{(0,_child_process.exec)(`curl -X POST -H "Content-Type: text/plain" ${server} -d restart`,(e,r)=>!e?resolve(r):reject(e));});}function relaunch(server){return new Promise((resolve,reject)=>{(0,_child_process.exec)(`curl -X POST -H "Content-Type: text/plain" ${server} -d relaunch`,(e,r)=>!e?resolve(r):reject(e));});}function exit(server){return new Promise((resolve,reject)=>{(0,_child_process.exec)(`curl -X POST -H "Content-Type: text/plain" ${server} -d exit`,(e,r)=>!e?resolve(r):reject(e));});}function createFactory(origin,destination){return async function create(filePath){const to=filePath.replace(origin,destination);log('create',to);try{await ensureDestinationM3U(to);return(0,_sacredFs.copyFile)(filePath,to);}catch(e){const{code}=e;if(code==='ENOENT'){error(`ENOENT in create for "${filePath}"`);}else{const{message}=e;error(message);}}};}function changeFactory(origin,destination){return async function change(filePath){const to=filePath.replace(origin,destination);log('change',to);try{await ensureDestinationM3U(to);return(0,_sacredFs.copyFile)(filePath,to);}catch(e){const{code}=e;if(code==='ENOENT'){error(`ENOENT in change for "${filePath}"`);}else{const{message}=e;error(message);}}};}function removeFactory(origin,destination){return async function remove(filePath){const to=filePath.replace(origin,destination);log('remove',to);try{return(0,_del.default)(to,{force:true});}catch({message}){error(message);}};}function queueRescanFactory(server,bounce){let t=null;let x=null;let y=null;return function enqueue(){if(t){clearTimeout(t);if(x){y=true;return;}}t=setTimeout(async function dequeue(){x=true;try{const response=await rescan(server);log(response.trim());t=null;x=null;if(y){y=null;enqueue();}}catch({message}){error(message);}},bounce);};}function queueRestartFactory(server,bounce){let t=null;let x=null;let y=null;return function enqueue(){if(t){clearTimeout(t);if(x){y=true;return;}}t=setTimeout(async function dequeue(){x=true;try{const response=await restart(server);log(response.trim());t=null;x=null;if(y){y=null;enqueue();}}catch({message}){error(message);}},bounce);};}function queueRelaunchFactory(server,bounce){let t=null;let x=null;let y=null;return function enqueue(){if(t){clearTimeout(t);if(x){y=true;return;}}t=setTimeout(async function dequeue(){x=true;try{const response=await relaunch(server);log(response.trim());t=null;x=null;if(y){y=null;enqueue();}}catch({message}){error(message);}},bounce);};}function ignorePatternFactory(ignore){const ignorePatterns=ignore.split(',');return function ignorePattern(filePath){return /(^|[/\\])\../.test(filePath)||(0,_anymatch.default)(ignorePatterns,filePath);};}async function execute(origin='.',destination='.',server='http://0.0.0.0:9790',ignore='',bounce=60000){let watcher;try{const o=_path.default.resolve(origin.replace('~',_os.default.homedir));if(!(await originDirExists(o)))throw new Error(`Origin "${origin}" does not exist.`);const d=_path.default.resolve(destination.replace('~',_os.default.homedir));const ignorePattern=ignorePatternFactory(ignore);watcher=_chokidar.default.watch(o,{ignored:ignorePattern});const create=createFactory(o,d);const change=changeFactory(o,d);const remove=removeFactory(o,d);await ensureDestinationDir(d);await removeAllM3UFromDestinationDir(d);const queueRescan=queueRescanFactory(server,bounce);watcher.on('add',async function handleAdd(filePath){try{await create(filePath);queueRescan();}catch({message}){error(message);}}).on('change',async function handleChange(filePath){try{await change(filePath);queueRescan();}catch({message}){error(message);}}).on('unlink',async function handleUnlink(filePath){try{await remove(filePath);queueRescan();}catch({message}){error(message);}}).on('error',({message})=>{error(`Error in watcher: "${message}"`);});queueRescan();}catch({message}){if(watcher)watcher.close();error(message);}}