@scrypted/server 0.80.0 → 0.82.0

package/src/runtime.ts

@@ -1,4 +1,3 @@
-import net from 'net';
 import { Device, DeviceInformation, DeviceProvider, EngineIOHandler, HttpRequest, HttpRequestHandler, ScryptedDevice, ScryptedInterface, ScryptedInterfaceMethod, ScryptedInterfaceProperty, ScryptedNativeId, ScryptedUser as SU } from '@scrypted/types';
 import AdmZip from 'adm-zip';
 import crypto from 'crypto';
@@ -9,6 +8,7 @@ import { ParamsDictionary } from 'express-serve-static-core';
 import fs from 'fs';
 import http, { ServerResponse } from 'http';
 import https from 'https';
+import net from 'net';
 import type { spawn as ptySpawn } from 'node-pty-prebuilt-multiarch';
 import path from 'path';
 import { ParsedQs } from 'qs';
@@ -17,8 +17,10 @@ import { PassThrough } from 'stream';
 import tar from 'tar';
 import { URL } from "url";
 import WebSocket, { Server as WebSocketServer } from "ws";
+import { computeClusterObjectHash } from './cluster/cluster-hash';
+import { ClusterObject } from './cluster/connect-rpc-object';
 import { Plugin, PluginDevice, ScryptedAlert, ScryptedUser } from './db-types';
-import { fetchBuffer, getNpmPackageInfo } from './http-fetch-helpers';
+import { httpFetch } from './fetch/http-fetch';
 import { createResponseInterface } from './http-interfaces';
 import { getDisplayName, getDisplayRoom, getDisplayType, getProvidedNameOrDefault, getProvidedRoomOrDefault, getProvidedTypeOrDefault } from './infer-defaults';
 import { IOServer } from './io';
@@ -35,17 +37,15 @@ import { getPluginVolume } from './plugin/plugin-volume';
 import { NodeForkWorker } from './plugin/runtime/node-fork-worker';
 import { PythonRuntimeWorker } from './plugin/runtime/python-worker';
 import { RuntimeWorker, RuntimeWorkerOptions } from './plugin/runtime/runtime-worker';
-import { ClusterObject } from './cluster/connect-rpc-object';
 import { getIpAddress, SCRYPTED_INSECURE_PORT, SCRYPTED_SECURE_PORT } from './server-settings';
 import { AddressSettings } from './services/addresses';
 import { Alerts } from './services/alerts';
 import { CORSControl } from './services/cors';
 import { Info } from './services/info';
-import { PluginComponent } from './services/plugin';
+import { getNpmPackageInfo, PluginComponent } from './services/plugin';
 import { ServiceControl } from './services/service-control';
 import { UsersService } from './services/users';
 import { getState, ScryptedStateManager, setState } from './state';
-import { computeClusterObjectHash } from './cluster/cluster-hash';
 
 interface DeviceProxyPair {
     handler: PluginDeviceProxyHandler;
@@ -619,7 +619,8 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
         }
         console.log('installing package', pkg, version);
 
-        const { body: tarball } = await fetchBuffer(`${registry.versions[version].dist.tarball}`, {
+        const { body: tarball } = await httpFetch( {
+            url: `${registry.versions[version].dist.tarball}`,
             // force ipv4 in case of busted ipv6.
             family: 4,
         });

package/src/scrypted-server-main.ts

@@ -16,13 +16,13 @@ import semver from 'semver';
 import { install as installSourceMapSupport } from 'source-map-support';
 import { createSelfSignedCertificate, CURRENT_SELF_SIGNED_CERTIFICATE_VERSION } from './cert';
 import { Plugin, ScryptedUser, Settings } from './db-types';
-import { getNpmPackageInfo } from './http-fetch-helpers';
 import Level from './level';
 import { PluginError } from './plugin/plugin-error';
 import { getScryptedVolume } from './plugin/plugin-volume';
 import { RPCResultError } from './rpc';
 import { ScryptedRuntime } from './runtime';
 import { getHostAddresses, SCRYPTED_DEBUG_PORT, SCRYPTED_INSECURE_PORT, SCRYPTED_SECURE_PORT } from './server-settings';
+import { getNpmPackageInfo } from './services/plugin';
 import { setScryptedUserPassword, UsersService } from './services/users';
 import { sleep } from './sleep';
 import { ONE_DAY_MILLISECONDS, UserToken } from './usertoken';

package/src/services/plugin.ts

@@ -1,11 +1,22 @@
 import { ScryptedInterfaceProperty, ScryptedNativeId } from "@scrypted/types";
 import semver from 'semver';
 import { Plugin } from '../db-types';
-import { getNpmPackageInfo } from "../http-fetch-helpers";
 import { hasMixinCycle } from "../mixin/mixin-cycle";
 import { ScryptedRuntime } from "../runtime";
 import { sleep } from "../sleep";
 import { getState } from "../state";
+import { httpFetch } from "../fetch/http-fetch";
+
+
+export async function getNpmPackageInfo(pkg: string) {
+    const { body } = await httpFetch({
+        url: `https://registry.npmjs.org/${pkg}`,
+        // force ipv4 in case of busted ipv6.
+        family: 4,
+        responseType: 'json',
+    });
+    return body;
+}
 
 export class PluginComponent {
     scrypted: ScryptedRuntime;

package/src/services/service-control.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { fetchJSON } from "../http-fetch-helpers";
+import { httpFetch } from "../fetch/http-fetch";
 import { ScryptedRuntime } from "../runtime";
 
 export class ServiceControl {
@@ -23,7 +23,8 @@ export class ServiceControl {
         const webhookUpdate = process.env.SCRYPTED_WEBHOOK_UPDATE;
         if (webhookUpdate) {
             const webhookUpdateAuthorization = process.env.SCRYPTED_WEBHOOK_UPDATE_AUTHORIZATION;
-            await fetchJSON(webhookUpdate, {
+            await httpFetch({
+                url: webhookUpdate,
                 headers: {
                     Authorization: webhookUpdateAuthorization,
                 }

package/dist/http-fetch-helpers.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { RequestOptions } from 'http';
-export declare function getNpmPackageInfo(pkg: string): Promise<any>;
-export declare function fetchJSON(url: string, init?: RequestOptions): Promise<{
-    json: any;
-    headers: import("http").IncomingHttpHeaders;
-}>;
-export declare function fetchPostJSON(url: string, postBody: any, init?: RequestOptions): Promise<{
-    json: any;
-    headers: import("http").IncomingHttpHeaders;
-}>;
-export declare function fetchBuffer(url: string, init?: RequestOptions, body?: Buffer): Promise<{
-    headers: import("http").IncomingHttpHeaders;
-    body: Buffer;
-}>;

package/dist/http-fetch-helpers.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchBuffer = exports.fetchPostJSON = exports.fetchJSON = exports.getNpmPackageInfo = void 0;
-const events_1 = require("events");
-const follow_redirects_1 = require("follow-redirects");
-async function getNpmPackageInfo(pkg) {
-    const { json } = await fetchJSON(`https://registry.npmjs.org/${pkg}`, {
-        // force ipv4 in case of busted ipv6.
-        family: 4,
-    });
-    return json;
-}
-exports.getNpmPackageInfo = getNpmPackageInfo;
-async function fetchJSON(url, init) {
-    init ||= {};
-    init.headers = {
-        ...init.headers,
-        Accept: 'application/json',
-    };
-    const { body, headers } = await fetchBuffer(url, init);
-    return {
-        json: JSON.parse(body.toString()),
-        headers,
-    };
-}
-exports.fetchJSON = fetchJSON;
-async function fetchPostJSON(url, postBody, init) {
-    init ||= {};
-    init.method = 'POST';
-    init.headers = {
-        ...init.headers,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-    };
-    const { body, headers } = await fetchBuffer(url, init, Buffer.from(JSON.stringify(postBody)));
-    return {
-        json: JSON.parse(body.toString()),
-        headers,
-    };
-}
-exports.fetchPostJSON = fetchPostJSON;
-async function fetchBuffer(url, init, body) {
-    const proto = url.startsWith('https:') ? follow_redirects_1.https : follow_redirects_1.http;
-    const request = proto.request(url, {
-        ...init,
-    });
-    if (body)
-        request.write(body);
-    request.end();
-    const [response] = await (0, events_1.once)(request, 'response');
-    const buffers = [];
-    response.on('data', buffer => buffers.push(buffer));
-    await (0, events_1.once)(response, 'end');
-    return {
-        headers: response.headers,
-        body: Buffer.concat(buffers),
-    };
-}
-exports.fetchBuffer = fetchBuffer;
-//# sourceMappingURL=http-fetch-helpers.js.map

package/dist/http-fetch-helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"http-fetch-helpers.js","sourceRoot":"","sources":["../src/http-fetch-helpers.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAC9B,uDAA+C;AAGxC,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,8BAA8B,GAAG,EAAE,EAAE;QAClE,qCAAqC;QACrC,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AAChB,CAAC;AAND,8CAMC;AAEM,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,IAAqB;IAC9D,IAAI,KAAK,EAAE,CAAC;IACZ,IAAI,CAAC,OAAO,GAAG;QACX,GAAG,IAAI,CAAC,OAAO;QACf,MAAM,EAAE,kBAAkB;KAC7B,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvD,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjC,OAAO;KACV,CAAA;AACL,CAAC;AAXD,8BAWC;AAEM,KAAK,UAAU,aAAa,CAAC,GAAW,EAAE,QAAa,EAAE,IAAqB;IACjF,IAAI,KAAK,EAAE,CAAC;IACZ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,OAAO,GAAG;QACX,GAAG,IAAI,CAAC,OAAO;QACf,MAAM,EAAE,kBAAkB;QAC1B,cAAc,EAAE,kBAAkB;KACrC,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO;QACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjC,OAAO;KACV,CAAA;AACL,CAAC;AAdD,sCAcC;AAEM,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,IAAqB,EAAE,IAAa;IAC/E,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,wBAAK,CAAC,CAAC,CAAC,uBAAI,CAAC;IAEtD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC/B,GAAG,IAAI;KACV,CAAC,CAAC;IACH,IAAI,IAAI;QACJ,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAA,aAAI,EAAC,OAAO,EAAE,UAAU,CAAsB,CAAC;IAExE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,MAAM,IAAA,aAAI,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE5B,OAAO;QACH,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;KAC/B,CAAC;AACN,CAAC;AAnBD,kCAmBC"}

package/src/http-fetch-helpers.ts

@@ -1,61 +0,0 @@
-import { once } from 'events';
-import { http, https } from 'follow-redirects';
-import { RequestOptions, IncomingMessage } from 'http';
-
-export async function getNpmPackageInfo(pkg: string) {
-    const { json } = await fetchJSON(`https://registry.npmjs.org/${pkg}`, {
-        // force ipv4 in case of busted ipv6.
-        family: 4,
-    });
-    return json;
-}
-
-export async function fetchJSON(url: string, init?: RequestOptions) {
-    init ||= {};
-    init.headers = {
-        ...init.headers,
-        Accept: 'application/json',
-    };
-    const { body, headers } = await fetchBuffer(url, init);
-    return {
-        json: JSON.parse(body.toString()),
-        headers,
-    }
-}
-
-export async function fetchPostJSON(url: string, postBody: any, init?: RequestOptions) {
-    init ||= {};
-    init.method = 'POST';
-    init.headers = {
-        ...init.headers,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-    };
-
-    const { body, headers } = await fetchBuffer(url, init, Buffer.from(JSON.stringify(postBody)));
-    return {
-        json: JSON.parse(body.toString()),
-        headers,
-    }
-}
-
-export async function fetchBuffer(url: string, init?: RequestOptions, body?: Buffer) {
-    const proto = url.startsWith('https:') ? https : http;
-
-    const request = proto.request(url, {
-        ...init,
-    });
-    if (body)
-        request.write(body);
-    request.end();
-    const [response] = await once(request, 'response') as IncomingMessage[];
-
-    const buffers: Buffer[] = [];
-    response.on('data', buffer => buffers.push(buffer));
-    await once(response, 'end');
-
-    return {
-        headers: response.headers,
-        body: Buffer.concat(buffers),
-    };
-}