afr-ls - npm Package Compare versions

Comparing version 0.0.1-beta.7 to 0.0.1-beta.8

lib/bin.js

 #!/usr/bin/env node
-if (process.argv.includes('-l')) {
-    Promise.resolve().then(function () { return require('./list'); });
-}
-else {
-    Promise.resolve().then(function () { return require('./start-server'); });
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var server_1 = require("./server");
+var list_1 = require("./list");
+Promise.resolve().then(function () { return require('yargs/yargs'); }).then(function (yargs) {
+    yargs(process.argv.splice(2))
+        .command('serve [port] [max]', 'Start server, should be started by pm2 in most cases', function (yargs) { return yargs.positional('port', { describe: 'port to bind on', default: 8515 }).positional('max', { describe: 'max count of served items', default: 100 }); }, function (argv) {
+        (0, server_1.start)(argv.port, argv.max);
+    })
+        .command('list [port] [key] [search]', 'List items by key', function (yargs) { return yargs
+        .positional('key', { describe: 'the catogory key', default: 'a' }).positional('search', { describe: 'the search key words', default: '' }).positional('port', { describe: 'the server port', default: 8515 }); }, function (argv) {
+        (0, list_1.list)(argv.key, argv.search, argv.port).then(console.log);
+    })
+        .parse();
+});
+// if (process.argv.includes('-l')) {
+//     import('./list');
+// } else {
+//     import('./start-server');
+// }

lib/list.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.list = void 0;
 var node_fetch_1 = require("node-fetch");
-var PORT = '8515';
-var arg = function (name) {
-    var prefix = "-".concat(name, "=");
-    var target = process.argv.find(function (it) { return it.trim().startsWith(prefix); });
-    return target ? target.replace(prefix, '') : null;
-};
-var format = function (it) { return "<item arg=\"".concat(it.url, "\">").concat(it.icon === '_' ? '' : "<icon>".concat(it.icon, "</icon>"), "<title>").concat(it.title, "</title><subtitle>").concat(it.url, "</subtitle></item>"); };
-var key = arg('key');
-if (key) {
-    var search = arg('search');
-    (0, node_fetch_1.default)("http://localhost:".concat(PORT, "/list?key=").concat(key).concat((search && search !== 'null') ? ('&search=' + search) : ''))
-        .then(function (e) { return e.text(); })
-        .then(function (str) {
-        var list = JSON.parse(str);
-        return '<?xml version="1.0"?>' + '<items>' + list.map(function (it) { return format(it); }).join('\n') + '</items>';
-    })
-        .then(console.log);
-}
-else {
-    process.exit();
-}
+var server_1 = require("./server");
+var format = function (it) { return "<item arg=\"".concat(it.url, "\">").concat(it.icon === '_' ? '' : "<icon>".concat(server_1.assetsbase.get(it.icon), "</icon>"), "<title>").concat(it.title, "</title><subtitle>").concat(it.url, "</subtitle></item>"); };
+var list = function (key, search, port) { return __awaiter(void 0, void 0, void 0, function () {
+    var res, text, list;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, node_fetch_1.default)("http://localhost:".concat(port, "/list?key=").concat(key).concat((search && search !== 'null') ? ('&search=' + search) : ''))];
+            case 1:
+                res = _a.sent();
+                return [4 /*yield*/, res.text()];
+            case 2:
+                text = _a.sent();
+                list = JSON.parse(text);
+                return [2 /*return*/, '<?xml version="1.0"?>' + '<items>' + list.map(function (it) { return format(it); }).join('\n') + '</items>'];
+        }
+    });
+}); };
+exports.list = list;

lib/server.js

 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
@@ -12,3 +48,3 @@ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = void 0;
+exports.start = exports.assetsbase = void 0;
 var fs = require("fs-extra");
@@ -18,4 +54,6 @@ var express = require("express");
 var path = require("path");
+var crypto = require("crypto");
+var node_fetch_1 = require("node-fetch");
 var child_process_1 = require("child_process");
-var file = (function () {
+var filebase = (function () {
     var HOME = (0, child_process_1.execSync)('echo $HOME').toString().trim();
@@ -44,6 +82,52 @@ var CACHE_DIR = "".concat(HOME, "/.afr-ls-content");
 })();
-var start = function (filebase, max, port, callback) {
-    if (filebase === void 0) { filebase = file; }
+exports.assetsbase = (function () {
+    var HOME = (0, child_process_1.execSync)('echo $HOME').toString().trim();
+    var CACHE_DIR = "".concat(HOME, "/.afr-ls-content");
+    var ASSETS_DIR = CACHE_DIR;
+    var hash = function (url) { return crypto.createHash('sha1').update(url).digest('hex'); };
+    var file = function (url) { return path.join(ASSETS_DIR, "".concat(hash(url), ".png")); };
+    var cache = new Map();
+    var result = {
+        download: function (url) { return __awaiter(void 0, void 0, void 0, function () {
+            var f, res_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!url.startsWith('http')) return [3 /*break*/, 2];
+                        f = result.get(url);
+                        if (f) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, (0, node_fetch_1.default)(url)];
+                    case 1:
+                        res_1 = _a.sent();
+                        return [2 /*return*/, new Promise(function (resolve) {
+                                res_1.body.pipe(fs.createWriteStream(file(url))).on('close', function () {
+                                    resolve();
+                                });
+                                setTimeout(function () { resolve(); }, 1000);
+                            })];
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); },
+        get: function (url) {
+            if (cache.has(url)) {
+                return cache.get(url);
+            }
+            var f = file(url);
+            if (fs.existsSync(f)) {
+                cache.set(url, f);
+                return f;
+            }
+            else {
+                return '';
+            }
+        }
+    };
+    return result;
+})();
+var start = function (port, max) {
+    if (port === void 0) { port = 8515; }
     if (max === void 0) { max = 100; }
-    if (port === void 0) { port = 8515; }
     var database = (function () {
@@ -123,5 +207,4 @@ var map = new Map();
             typeof icon === 'string') {
-            console.log(icon, url, title);
             database.push(key, { title: title, url: url, icon: icon });
-            res.sendStatus(200);
+            exports.assetsbase.download(icon).then(function (f) { return res.sendStatus(200); });
         }
@@ -159,7 +242,6 @@ else {
     });
-    return app.listen(port, 'localhost', function () {
-        console.log("Listening on port ".concat(port, "."));
-        callback && callback();
-    });
+    return new Promise(function (res) { return app.listen(port, 'localhost', function () {
+        res();
+    }); });
 };
 exports.start = start;

package.json

 {
   "name": "afr-ls",
-  "version": "0.0.1-beta.7",
+  "version": "0.0.1-beta.8",
   "description": "Alfred List",
@@ -19,3 +19,4 @@ "bin": "lib/bin.js",
     "fs-extra": "^11.1.1",
-    "node-fetch": "^2.0.0"
+    "node-fetch": "^2.0.0",
+    "yargs": "^17.7.2"
   },
@@ -28,2 +29,3 @@ "devDependencies": {
     "@types/node-fetch": "^2.6.4",
+    "@types/yargs": "^17.0.31",
     "axios": "^1.4.0",
@@ -30,0 +32,0 @@ "jest": "^29.6.1",

src/bin.ts

 #!/usr/bin/env node
-if (process.argv.includes('-l')) {
-    import('./list');
-} else {
-    import('./start-server');
-}
+
+import { start } from './server';
+import { list } from './list';
+
+import('yargs/yargs').then(
+    yargs => {
+
+        yargs(process.argv.splice(2))
+            .command(
+                'serve [port] [max]',
+                'Start server, should be started by pm2 in most cases',
+                yargs => yargs.positional(
+                    'port',
+                    { describe: 'port to bind on', default: 8515 }
+                ).positional(
+                    'max',
+                    { describe: 'max count of served items', default: 100 }
+                ),
+                argv => {
+                    start(argv.port, argv.max)
+                },
+            )
+            .command(
+                'list [port] [key] [search]',
+                'List items by key',
+                yargs => yargs
+                    .positional(
+                        'key',
+                        { describe: 'the catogory key', default: 'a' },
+                    ).positional(
+                        'search',
+                        { describe: 'the search key words', default: '' }
+                    ).positional(
+                        'port',
+                        { describe: 'the server port', default: 8515 }
+                    ),
+                argv => {
+                    list(argv.key, argv.search, argv.port).then(console.log)
+                }
+            )
+            .parse();
+    }
+);
+
+
+
+// if (process.argv.includes('-l')) {
+//     import('./list');
+// } else {
+//     import('./start-server');
+// }

src/list.ts

 import fetch from 'node-fetch';
 import type { Item } from './server';
+import { assetsbase } from './server';
 
-const PORT = '8515';
+const format = (it: Item) => `<item arg="${it.url}">${it.icon === '_' ? '' : `<icon>${assetsbase.get(it.icon)}</icon>`}<title>${it.title}</title><subtitle>${it.url}</subtitle></item>`;
 
-const arg = (name: string): string | null => {
-    const prefix = `-${name}=`;
-    const target = process.argv.find(it => it.trim().startsWith(prefix));
-    return target ? target.replace(prefix, '') : null;
-}
+export const list = async (
+    key: string,
+    search: string,
+    port: number
+) => {
+    const res = await fetch(`http://localhost:${port}/list?key=${key}${(search && search !== 'null') ? ('&search=' + search) : ''}`);
+    const text = await res.text();
+    const list = JSON.parse(text) as Array<Item>;
 
-const format = (it: Item) => `<item arg="${it.url}">${it.icon === '_' ? '' : `<icon>${it.icon}</icon>`}<title>${it.title}</title><subtitle>${it.url}</subtitle></item>`;
-
-const key = arg('key');
-if (key) {
-    const search = arg('search');
-    fetch(`http://localhost:${PORT}/list?key=${key}${(search && search !== 'null') ? ('&search=' + search) : ''}`)
-        .then(e => e.text())
-        .then(str => {
-            const list = JSON.parse(str) as Array<Item>;
-            return '<?xml version="1.0"?>' + '<items>' + list.map(it => format(it)).join('\n') + '</items>';
-        })
-        .then(
-            console.log
-        );
-} else {
-    process.exit();
-}
+    return '<?xml version="1.0"?>' + '<items>' + list.map(it => format(it)).join('\n') + '</items>';
+}

src/server.ts

@@ -5,2 +5,4 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
+import * as crypto from 'crypto';
+import fetch from 'node-fetch';
 import { execSync } from 'child_process';
@@ -10,3 +12,3 @@
 
-const file = (() => {
+const filebase = (() => {
 
@@ -44,8 +46,57 @@ const HOME = execSync('echo $HOME').toString().trim();
 
+export const assetsbase = (() => {
+
+  const HOME = execSync('echo $HOME').toString().trim();
+  const CACHE_DIR = `${HOME}/.afr-ls-content`;
+  const ASSETS_DIR = CACHE_DIR;
+
+  const hash = (url: string) => crypto.createHash('sha1').update(url).digest('hex');
+
+  const file = (url: string) => path.join(ASSETS_DIR, `${hash(url)}.png`);
+
+  const cache = new Map<string, string>();
+
+  const result = {
+    download: async (url: string) => {
+      if (url.startsWith('http')) {
+
+        const f = result.get(url);
+        if (f) {
+          return;
+        }
+
+        const res = await fetch(url);
+
+        return new Promise<void>(
+          resolve => {
+            res.body.pipe(
+              fs.createWriteStream(file(url))
+            ).on('close', () => {
+              resolve();
+            });
+            setTimeout(() => { resolve() }, 1000);
+          }
+        )
+      }
+    },
+    get: (url: string) => {
+      if (cache.has(url)) {
+        return cache.get(url)!;
+      }
+      const f = file(url);
+      if (fs.existsSync(f)) {
+        cache.set(url, f);
+        return f;
+      } else {
+        return '';
+      }
+    }
+  };
+  return result;
+})();
+
 export const start = (
-  filebase: typeof file = file,
+  port: number = 8515,
   max: number = 100,
-  port: number = 8515,
-  callback?: () => void
-) => {
+): Promise<void> => {
 
@@ -150,5 +201,6 @@ const database = (() => {
     ) {
-      console.log(icon, url, title);
       database.push(key, { title, url, icon });
-      res.sendStatus(200);
+      assetsbase.download(icon).then(
+        f => res.sendStatus(200)
+      );
     } else {
@@ -190,9 +242,9 @@ res.sendStatus(400);
 
-  return app.listen(
+  return new Promise(res => app.listen(
     port,
     'localhost',
     () => {
-      console.log(`Listening on port ${port}.`);
-      callback && callback();
-    });
+      res();
+    }
+  ));
 };

No alert changes

Improved metrics

Total package byte prevSize

33600

increased by43.68%

Lines of code

720

increased by37.67%

Worsened metrics

Dependency count

5

increased by25%

Dev dependency count

10

increased by11.11%

Number of package files

12

decreased by-14.29%

Dependency changes

• + Addedyargs@^17.7.2

• + Addedansi-regex@5.0.1(transitive)

• + Addedansi-styles@4.3.0(transitive)

• + Addedcliui@8.0.1(transitive)

• + Addedcolor-convert@2.0.1(transitive)

• + Addedcolor-name@1.1.4(transitive)

• + Addedemoji-regex@8.0.0(transitive)

• + Addedescalade@3.2.0(transitive)

• + Addedget-caller-file@2.0.5(transitive)

• + Addedis-fullwidth-code-point@3.0.0(transitive)

• + Addedrequire-directory@2.1.1(transitive)

• + Addedstring-width@4.2.3(transitive)

• + Addedstrip-ansi@6.0.1(transitive)

• + Addedwrap-ansi@7.0.0(transitive)

• + Addedy18n@5.0.8(transitive)

• + Addedyargs@17.7.2(transitive)

• + Addedyargs-parser@21.1.1(transitive)