cloudcmd 16.1.1 → 16.3.1

package/server/distribute/import.js

@@ -6,10 +6,10 @@ const squad = require('squad');
 const fullstore = require('fullstore');
 
 const io = require('socket.io-client');
-const forEachKey = currify(require('for-each-key'));
-
 const log = require('./log');
+
 const env = require('../env');
+const forEachKey = currify(require('for-each-key'));
 
 const {
     importStr,

package/server/markdown/index.js

@@ -8,10 +8,10 @@ const ponse = require('ponse');
 const threadIt = require('thread-it');
 const {read} = require('redzip');
 
-const parse = threadIt(join(__dirname, 'worker'));
-
 const root = require('../root');
 
+const parse = threadIt(join(__dirname, 'worker'));
+
 threadIt.init();
 
 // warm up

package/server/route.js

@@ -20,9 +20,11 @@ const root = require(DIR_SERVER + 'root');
 const prefixer = require(DIR_SERVER + 'prefixer');
 const CloudFunc = require(DIR_COMMON + 'cloudfunc');
 
-const getPrefix = (config) => prefixer(config('prefix'));
+const Columns = require(`${DIR_SERVER}/columns`);
 
-const onceRequire = once(require);
+const Template = require(`${DIR_SERVER}/template`);
+
+const {FS} = CloudFunc;
 
 const sendIndex = (params, data) => {
     const ponseParams = {
@@ -33,10 +35,8 @@ const sendIndex = (params, data) => {
     ponse.send(data, ponseParams);
 };
 
-const {FS} = CloudFunc;
-
-const Columns = require(`${DIR_SERVER}/columns`);
-const Template = require(`${DIR_SERVER}/template`);
+const onceRequire = once(require);
+const getPrefix = (config) => prefixer(config('prefix'));
 
 const getReadDir = (config) => {
     if (!config('dropbox'))

package/server/{server.js → server.mjs}

@@ -1,39 +1,36 @@
-'use strict';
+import cloudcmd from './cloudcmd.js';
 
-const DIR_SERVER = './';
-const cloudcmd = require(DIR_SERVER + 'cloudcmd');
+import http from 'http';
+import {promisify} from 'util';
+import currify from 'currify';
+import squad from 'squad';
+import tryToCatch from 'try-to-catch';
+import wraptile from 'wraptile';
+import compression from 'compression';
+import threadIt from 'thread-it';
 
-const http = require('http');
-const {promisify} = require('util');
-const currify = require('currify');
-const squad = require('squad');
-const tryToCatch = require('try-to-catch');
-const wraptile = require('wraptile');
-const compression = require('compression');
-const threadIt = require('thread-it');
+import exit from './exit.js';
+import opn from 'open';
 
-const two = currify((f, a, b) => f(a, b));
-const exit = require(DIR_SERVER + 'exit');
+import express from 'express';
+import {Server} from 'socket.io';
+import tryRequire from 'tryrequire';
 
-const exitPort = two(exit, 'cloudcmd --port: %s');
 const bind = (f, self) => f.bind(self);
-const promisifySelf = squad(promisify, bind);
 
+const two = currify((f, a, b) => f(a, b));
 const shutdown = wraptile(async (promises) => {
     console.log('closing cloudcmd...');
     await Promise.all(promises);
     threadIt.terminate();
     process.exit(0);
 });
+const promisifySelf = squad(promisify, bind);
 
-const opn = require('open');
-const express = require('express');
-const io = require('socket.io');
-
-const tryRequire = require('tryrequire');
+const exitPort = two(exit, 'cloudcmd --port: %s');
 const logger = tryRequire('morgan');
 
-module.exports = async (options, config) => {
+export default async (options, config) => {
     const prefix = config('prefix');
     const port = process.env.PORT /* c9           */
                  || config('port');
@@ -51,7 +48,7 @@ module.exports = async (options, config) => {
     if (prefix)
         app.get('/', (req, res) => res.redirect(prefix + '/'));
     
-    const socketServer = io(server, {
+    const socketServer = new Server(server, {
         path: `${prefix}/socket.io`,
     });
     

package/tmpl/config.hbs

@@ -34,7 +34,7 @@
             Diff
         </label>
     </li>
-    <li title="Pack text data transfered by an Editor">
+    <li title="Pack text data transferred by an Editor">
         <label>
             <input
                 data-name="js-zip"
@@ -43,7 +43,7 @@
             Zip
          </label>
     </li>
-    <li title="Visible Collumns">
+    <li title="Visible Columns">
         <select data-name="js-columns" class="form-control full-width" title="Visible Columns">
             <option {{ name-size-date-owner-mode-selected }}>name-size-date-owner-mode</option>
             <option {{ name-size-date-selected }}>name-size-date</option>